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 f8f6929d8f254ea70422589d916d3cb2fc796766..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.
 
@@ -230,9 +230,7 @@ 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.
@@ -328,15 +326,6 @@ 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
-       help
-          This option allows trapping of rare doublefault exceptions that
-          would otherwise cause a system to silently reboot. Disabling this
-          option saves about 4k.
-
 config ELF_CORE
        default y
        bool "Enable ELF core dumps" if EMBEDDED
@@ -438,6 +427,9 @@ config SLOB
        default !SLAB
        bool
 
+config OBSOLETE_INTERMODULE
+       tristate
+
 menu "Loadable module support"
 
 config MODULES