Merge branch 'kbuild/rc-fixes' into kbuild/kconfig

[net-next-2.6.git] / arch / mn10300 / Kconfig

diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig
index 1c4565a9102b269802129324f1b322eb8834cbbf..ba8bd665ba4b5ad5893d4bc1f6c69fad66d0e943 100644 (file)
--- a/arch/mn10300/Kconfig
+++ b/arch/mn10300/Kconfig
@@ -1,10 +1,3 @@
-#
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-#
-
-mainmenu "Linux Kernel Configuration"
-
 config MN10300
        def_bool y
        select HAVE_OPROFILE
@@ -46,9 +39,6 @@ config GENERIC_FIND_NEXT_BIT
 config GENERIC_HWEIGHT
        def_bool y
 
-config GENERIC_TIME
-       def_bool y
-
 config GENERIC_BUG
        def_bool y
 
@@ -69,8 +59,6 @@ config HZ
        int
        default 1000
 
-mainmenu "Matsushita MN10300/AM33 Kernel Configuration"
-
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"