Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[linux-2.6] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 25f4d74adf7ed49d48a635b93b215b4f3bd96352..b9923b1434a2f82a698c5011fbe55191bddf8965 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -99,7 +99,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 +427,9 @@ config SLOB
        default !SLAB
        bool
 
+config OBSOLETE_INTERMODULE
+       tristate
+
 menu "Loadable module support"
 
 config MODULES