Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[pandora-kernel.git] / arch / score / Kconfig

diff --git a/arch/score/Kconfig b/arch/score/Kconfig
index 55d413e..4293fdc 100644 (file)
--- a/arch/score/Kconfig
+++ b/arch/score/Kconfig
@@ -1,8 +1,3 @@
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-
-mainmenu "Linux/SCORE Kernel Configuration"
-
 menu "Machine selection"
 
 choice
@@ -55,9 +50,6 @@ config GENERIC_CALIBRATE_DELAY
 config GENERIC_CLOCKEVENTS
        def_bool y
 
-config GENERIC_TIME
-       def_bool y
-
 config SCHED_NO_NO_OMIT_FRAME_POINTER
        def_bool y