Merge branch 'master'

[linux-2.6-omap-h63xx.git] / arch / xtensa / Kconfig

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 3e89767cea72ef4b6a764e23ceb298ca4de5b007..7ee4a14ec3b1949d38766b4247bf71d2f2f14159 100644 (file)
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -18,18 +18,10 @@ config XTENSA
          with reasonable minimum requirements.  The Xtensa Linux project has
          a home page at <http://xtensa.sourceforge.net/>.
 
-config UID16
-       bool
-       default n
-
 config RWSEM_XCHGADD_ALGORITHM
        bool
        default y
 
-config HAVE_DEC_LOCK
-       bool
-       default y
-
 config GENERIC_HARDIRQS
        bool
        default y
@@ -132,7 +124,7 @@ config XTENSA_CPU_CLOCK
 config GENERIC_CALIBRATE_DELAY
        bool "Auto calibration of the BogoMIPS value"
        ---help---
-         The BogoMIPS value can easily derived from the CPU frequency.
+         The BogoMIPS value can easily be derived from the CPU frequency.
 
 config CMDLINE_BOOL
        bool "Default bootloader kernel arguments"
@@ -158,6 +150,8 @@ config XTENSA_ISS_NETWORK
        depends on XTENSA_PLATFORM_ISS
        default y
 
+source "mm/Kconfig"
+
 endmenu
 
 menu "Bus options"
@@ -226,6 +220,8 @@ source "fs/Kconfig.binfmt"
 
 endmenu
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 
 source "fs/Kconfig"