Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[linux-2.6-block.git] / arch / mips / Kconfig

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index edbbae17e8209e08833bb8acc6801c433cb1ee1f..f5e121213c229dd289bef22129d10337a97c54fa 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -29,6 +29,7 @@ config MIPS
        select HAVE_MEMBLOCK
        select HAVE_MEMBLOCK_NODE_MAP
        select ARCH_DISCARD_MEMBLOCK
+       select GENERIC_SMP_IDLE_THREAD
 
 menu "Machine selection"
 
@@ -1001,12 +1002,12 @@ config HOLES_IN_ZONE
        bool
 
 #
-# Endianess selection.  Sufficiently obscure so many users don't know what to
+# Endianness selection.  Sufficiently obscure so many users don't know what to
 # answer,so we try hard to limit the available choices.  Also the use of a
 # choice statement should be more obvious to the user.
 #
 choice
-       prompt "Endianess selection"
+       prompt "Endianness selection"
        help
          Some MIPS machines can be configured for either little or big endian
          byte order. These modes require different kernels and a different
@@ -2457,6 +2458,7 @@ config MIPS32_COMPAT
 config COMPAT
        bool
        depends on MIPS32_COMPAT
+       select ARCH_WANT_OLD_COMPAT_IPC
        default y
 
 config SYSVIPC_COMPAT