Merge branches 'sched/rt' and 'sched/urgent' into sched/core

[linux-2.6-omap-h63xx.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index b9d1dd2221041a01f1ac38347313b2e19fc4201b..a90fcbeeb9d23bbd542a091cace403b970ab371d 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -725,13 +725,6 @@ config KALLSYMS_ALL
 
           Say N.
 
-config KALLSYMS_STRIP_GENERATED
-       bool "Strip machine generated symbols from kallsyms"
-       depends on KALLSYMS_ALL
-       default y
-       help
-         Say N if you want kallsyms to retain even machine generated symbols.
-
 config KALLSYMS_EXTRA_PASS
        bool "Do an extra kallsyms pass"
        depends on KALLSYMS
@@ -973,7 +966,6 @@ config SLABINFO
 
 config RT_MUTEXES
        boolean
-       select PLIST
 
 config BASE_SMALL
        int