Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[linux-2.6] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 3e7b257fc05fca6fba4d6325a3da1ae95c3f9fde..f0e62e5ce0dc03fa8cdc1b19990f178d5e22fc8e 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -720,7 +720,7 @@ config VM_EVENT_COUNTERS
 config SLUB_DEBUG
        default y
        bool "Enable SLUB debugging support" if EMBEDDED
-       depends on SLUB
+       depends on SLUB && SYSFS
        help
          SLUB has extensive debug support features. Disabling these can
          result in significant savings in code size. This also disables
@@ -825,6 +825,15 @@ menuconfig MODULES
 
          If unsure, say Y.
 
+config MODULE_FORCE_LOAD
+       bool "Forced module loading"
+       depends on MODULES
+       default n
+       help
+         This option allows loading of modules even if that would set the
+          'F' (forced) taint, due to lack of version info.  Which is
+         usually a really bad idea.
+
 config MODULE_UNLOAD
        bool "Module unloading"
        depends on MODULES