linux-next: manual merge of the mvebu tree with the arm-soc tree

Stephen Rothwell
2014-05-06T01:08:08Z

[-- Attachment #1: Type: text/plain, Size: 1495 bytes --]

Hi all,

Today's linux-next merge of the mvebu tree got a conflict in
arch/arm/mach-mvebu/Kconfig between commit 55400f3a1f89 ("ARM: mvebu:
clean-up unneeded kconfig selects") from the arm-soc tree and commit
8e6ac2033822 ("ARM: mvebu: enable the ARM SCU on Armada 375 and Armada
38x") from the mvebu tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc arch/arm/mach-mvebu/Kconfig
index bfc5af18e483,d6b0a772a6dd..000000000000
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@@ -3,8 -3,10 +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
@@@ -36,6 -39,10 +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
@@@ -48,6 -55,10 +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

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]