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