From: Olof Johansson Date: Tue, 20 May 2014 05:27:05 +0000 (-0700) Subject: Merge branch 'cleanup/kconfig' into next/soc X-Git-Tag: v3.16-rc1~43^2~15 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5fe0163aea863b1a5f79173619fdfe9e9baad299;p=platform%2Fkernel%2Flinux-exynos.git Merge branch 'cleanup/kconfig' into next/soc Bring in the cleanup branch due to conflicts in new additions. Should really have been the base before the other branch, but this way works too. * cleanup/kconfig: ARM: qcom: clean-up unneeded kconfig selects ARM: bcm: clean-up unneeded kconfig selects ARM: mvebu: clean-up unneeded kconfig selects Signed-off-by: Olof Johansson --- 5fe0163aea863b1a5f79173619fdfe9e9baad299 diff --cc arch/arm/mach-mvebu/Kconfig index d6b0a77,bfc5af1..199187e --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@@ -3,10 -3,8 +3,9 @@@ config ARCH_MVEB select ARCH_SUPPORTS_BIG_ENDIAN select CLKSRC_MMIO select GENERIC_IRQ_CHIP - select IRQ_DOMAIN select PINCTRL select PLAT_ORION + select SOC_BUS select MVEBU_MBUS select ZONE_DMA if ARM_LPAE select ARCH_REQUIRE_GPIOLIB @@@ -39,10 -36,6 +37,9 @@@ config MACH_ARMADA_37 select ARM_ERRATA_753970 select ARM_GIC select ARMADA_375_CLK - select CPU_V7 + select HAVE_ARM_SCU + select HAVE_ARM_TWD if SMP + select HAVE_SMP select MACH_MVEBU_V7 select PINCTRL_ARMADA_375 help @@@ -55,10 -48,6 +52,9 @@@ config MACH_ARMADA_38 select ARM_ERRATA_753970 select ARM_GIC select ARMADA_38X_CLK - select CPU_V7 + select HAVE_ARM_SCU + select HAVE_ARM_TWD if SMP + select HAVE_SMP select MACH_MVEBU_V7 select PINCTRL_ARMADA_38X help