Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into...

diff --combined arch/arm/Kconfig
index b3135378ac393c9a3a2ab2cd1eed950ac57c68e6,1ad6fb6c094db415ec76a72a28356e75bdfd7d17..22efc5d9c952dc082b0df0754c58ca90b35b05ab
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1549,32 -1549,6 +1549,32 @@@ config MCP
          for (multi-)cluster based systems, such as big.LITTLE based
          systems.
  
 +config BIG_LITTLE
 +      bool "big.LITTLE support (Experimental)"
 +      depends on CPU_V7 && SMP
 +      select MCPM
 +      help
 +        This option enables support selections for the big.LITTLE
 +        system architecture.
 +
 +config BL_SWITCHER
 +      bool "big.LITTLE switcher support"
 +      depends on BIG_LITTLE && MCPM && HOTPLUG_CPU
 +      select CPU_PM
 +      select ARM_CPU_SUSPEND
 +      help
 +        The big.LITTLE "switcher" provides the core functionality to
 +        transparently handle transition between a cluster of A15's
 +        and a cluster of A7's in a big.LITTLE system.
 +
 +config BL_SWITCHER_DUMMY_IF
 +      tristate "Simple big.LITTLE switcher user interface"
 +      depends on BL_SWITCHER && DEBUG_KERNEL
 +      help
 +        This is a simple and dummy char dev interface to control
 +        the big.LITTLE switcher core code.  It is meant for
 +        debugging purposes only.
 +
  choice
        prompt "Memory split"
        default VMSPLIT_3G
@@@ -2243,8 -2217,7 +2243,7 @@@ config NEO
  
  config KERNEL_MODE_NEON
        bool "Support for NEON in kernel mode"
-       default n
-       depends on NEON
+       depends on NEON && AEABI
        help
          Say Y to include support for NEON in kernel mode.