From: Arnd Bergmann Date: Tue, 18 Mar 2014 15:25:47 +0000 (+0100) Subject: Merge branch 'cleanup/kconfig' into next/drivers X-Git-Tag: v3.15-rc1~76^2~5 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=a65b5f4ccda42f416b7edf2c83ef9ccd5a8a181d;p=linux.git 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 --- a65b5f4ccda42f416b7edf2c83ef9ccd5a8a181d diff --cc arch/arm/mach-omap2/Kconfig index 46f8c538d2bc,922cbd8e3519..c1fdf926de3b --- a/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 25506209e97a,d2c13ba1190b..abf9ee9bbc3f --- a/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 ARCH_HAS_RESET_CONTROLLER - select MIGHT_HAVE_CACHE_L2X0 - select HAVE_SMP select HAVE_ARM_SCU if SMP select ARCH_REQUIRE_GPIOLIB select ARM_ERRATA_754322