Merge branch 'master' into upstream

[pandora-kernel.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index f1bc2f0..df864a3 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -182,7 +182,8 @@ config AUDITSYSCALL
        help
          Enable low-overhead system-call auditing infrastructure that
          can be used independently or with another kernel subsystem,
-         such as SELinux.
+         such as SELinux.  To use audit's filesystem watch feature, please
+         ensure that INOTIFY is configured.
 
 config IKCONFIG
        bool "Kernel .config support"
@@ -374,15 +375,6 @@ config SLAB
          SLOB is more space efficient but does not scale well and is
          more susceptible to fragmentation.
 
-config DOUBLEFAULT
-       default y
-       bool "Enable doublefault exception handler" if EMBEDDED && X86_32
-       help
-          This option allows trapping of rare doublefault exceptions that
-          would otherwise cause a system to silently reboot. Disabling this
-          option saves about 4k and might cause you much additional grey
-          hair.
-
 endmenu                # General setup
 
 config TINY_SHMEM
@@ -398,9 +390,6 @@ config SLOB
        default !SLAB
        bool
 
-config OBSOLETE_INTERMODULE
-       tristate
-
 menu "Loadable module support"
 
 config MODULES