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

[mv-sheeva.git] / arch / xtensa / Kconfig

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index ebe228d02b08d6265723306b970a7fd338c5f9ec..d373d159e75e408eef28e722cc8401885e9ffd0a 100644 (file)
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -1,8 +1,3 @@
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-
-mainmenu "Linux/Xtensa Kernel Configuration"
-
 config FRAME_POINTER
        def_bool n
 
@@ -48,9 +43,6 @@ config HZ
        int
        default 100
 
-config GENERIC_TIME
-       def_bool y
-
 source "init/Kconfig"
 source "kernel/Kconfig.freezer"