Merge branch 'cleanup/kconfig' into next/drivers

This resolves a conflict between the new sti reset
controller driver and the Kconfig cleanup.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/mach-omap2/Kconfig
index 46f8c538d2bc8e33dd61f9a33fcf9336a4c8087e,922cbd8e35197d8f5c531fa8dc10402a79a4020c..c1fdf926de3b303953489df46e0625ffe3bb4283
--- 1/arch/arm/mach-omap2/Kconfig
--- 2/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@@ -82,10 -71,7 +71,8 @@@ config SOC_DRA7X
        select ARCH_OMAP2PLUS
        select ARM_CPU_SUSPEND if PM
        select ARM_GIC
-       select CPU_V7
-       select HAVE_SMP
        select HAVE_ARM_ARCH_TIMER
 +      select IRQ_CROSSBAR
  
  config ARCH_OMAP2PLUS
        bool

diff --cc arch/arm/mach-sti/Kconfig
index 25506209e97a3e4c6ece3ce4a7e486465acb12ba,d2c13ba1190b784b4804132f92dec7692b8a3a0d..abf9ee9bbc3f445c182e4893a8d0f1f9da3f4e9b
--- 1/arch/arm/mach-sti/Kconfig
--- 2/arch/arm/mach-sti/Kconfig
+++ b/arch/arm/mach-sti/Kconfig
@@@ -7,9 -5,6 +5,7 @@@ menuconfig ARCH_ST
        select PINCTRL
        select PINCTRL_ST
        select MFD_SYSCON
-       select MIGHT_HAVE_CACHE_L2X0
-       select HAVE_SMP
 +      select ARCH_HAS_RESET_CONTROLLER
        select HAVE_ARM_SCU if SMP
        select ARCH_REQUIRE_GPIOLIB
        select ARM_ERRATA_754322