Merge branches 'alignment', 'fixes', 'l2c' (early part) and 'misc' into for-next

[uclinux-h8/linux.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c9d7196..8615dfa 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -165,12 +165,9 @@ config TRACE_IRQFLAGS_SUPPORT
        bool
        default y
 
-config RWSEM_GENERIC_SPINLOCK
-       bool
-       default y
-
 config RWSEM_XCHGADD_ALGORITHM
        bool
+       default y
 
 config ARCH_HAS_ILOG2_U32
        bool
@@ -1105,11 +1102,6 @@ source "arch/arm/firmware/Kconfig"
 
 source arch/arm/mm/Kconfig
 
-config ARM_NR_BANKS
-       int
-       default 16 if ARCH_EP93XX
-       default 8
-
 config IWMMXT
        bool "Enable iWMMXt support"
        depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_PJ4 || CPU_PJ4B
@@ -2244,6 +2236,11 @@ config ARCH_SUSPEND_POSSIBLE
 config ARM_CPU_SUSPEND
        def_bool PM_SLEEP
 
+config ARCH_HIBERNATION_POSSIBLE
+       bool
+       depends on MMU
+       default y if ARCH_SUSPEND_POSSIBLE
+
 endmenu
 
 source "net/Kconfig"