Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 25f4d74adf7ed49d48a635b93b215b4f3bd96352..8b7abae87bf9c15ec3934e73322df849595e81dc 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -31,19 +31,8 @@ config EXPERIMENTAL
          you say Y here, you will be offered the choice of using features or
          drivers that are currently considered to be in the alpha-test phase.
 
-config CLEAN_COMPILE
-       bool "Select only drivers expected to compile cleanly" if EXPERIMENTAL
-       default y
-       help
-         Select this option if you don't even want to see the option
-         to configure known-broken drivers.
-
-         If unsure, say Y
-
 config BROKEN
        bool
-       depends on !CLEAN_COMPILE
-       default y
 
 config BROKEN_ON_SMP
        bool
@@ -99,7 +88,7 @@ config SWAP
        default y
        help
          This option allows you to choose whether you want to have support
-         for socalled swap devices or swap files in your kernel that are
+         for so called swap devices or swap files in your kernel that are
          used to provide more virtual memory than the actual RAM present
          in your computer.  If unsure say Y.
 
@@ -427,6 +416,9 @@ config SLOB
        default !SLAB
        bool
 
+config OBSOLETE_INTERMODULE
+       tristate
+
 menu "Loadable module support"
 
 config MODULES