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

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

diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index 3a9319f93e89cdad744622eef5e2bed2aa2b3be7..3ffb886f23483505e0fbc3ac5b32d18884554785 100644 (file)
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -1,10 +1,3 @@
-#
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-#
-
-mainmenu "Linux/M32R Kernel Configuration"
-
 config M32R
        bool
        default y
@@ -44,9 +37,6 @@ config HZ
        int
        default 100
 
-config GENERIC_TIME
-       def_bool y
-
 config ARCH_USES_GETTIMEOFFSET
        def_bool y