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

[linux-2.6] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 1a1f114a37e85e6756548ab03564293b9fb63bbd..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.
 
@@ -230,13 +219,21 @@ source "usr/Kconfig"
 
 config UID16
        bool "Enable 16-bit UID system calls" if EMBEDDED
-       depends !ALPHA && !PPC && !PPC64 && !PARISC && !V850 && !ARCH_S390X
-       depends !X86_64 || IA32_EMULATION
-       depends !SPARC64 || SPARC32_COMPAT
+       depends on ARM || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && SPARC32_COMPAT) || UML || (X86_64 && IA32_EMULATION)
        default y
        help
          This enables the legacy 16-bit UID syscall wrappers.
 
+config VM86
+       depends X86
+       default y
+       bool "Enable VM86 support" if EMBEDDED
+       help
+          This option is required by programs like DOSEMU to run 16-bit legacy
+         code on X86 processors. It also may be needed by software like
+          XFree86 to initialize some video cards via BIOS. Disabling this
+          option saves about 6k.
+
 config CC_OPTIMIZE_FOR_SIZE
        bool "Optimize for size (Look out for broken compilers!)"
        default y
@@ -318,14 +315,11 @@ config BUG
           option for embedded systems with no facilities for reporting errors.
           Just say Y.
 
-config DOUBLEFAULT
-       depends X86
-       default y if X86
-       bool "Enable doublefault exception handler" if EMBEDDED
+config ELF_CORE
+       default y
+       bool "Enable ELF core dumps" if EMBEDDED
        help
-          This option allows trapping of rare doublefault exceptions that
-          would otherwise cause a system to silently reboot. Disabling this
-          option saves about 4k.
+         Enable support for generating core dumps. Disabling saves about 4k.
 
 config BASE_FULL
        default y
@@ -422,6 +416,9 @@ config SLOB
        default !SLAB
        bool
 
+config OBSOLETE_INTERMODULE
+       tristate
+
 menu "Loadable module support"
 
 config MODULES