From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 17 Mar 2014 10:50:05 +0000 (+0100)
Subject: Merge branch 'mvebu/soc3' into next/dt
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=54cab10f63f20750cd2911e353cf8068f1ecf0a5;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'mvebu/soc3' into next/dt

The dts Makefile has a bunch of nasty conflicts, attempt to resolve
these now to avoid trouble later.

Conflicts:
	arch/arm/boot/dts/Makefile

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

54cab10f63f20750cd2911e353cf8068f1ecf0a5
diff --cc arch/arm/boot/dts/Makefile
index 489959dfe6d1,548093b0de26..3d34936fb476
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -82,8 -81,7 +82,8 @@@ dtb-$(CONFIG_ARCH_HIGHBANK) += highbank
  	ecx-2000.dtb
  dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \
  	integratorcp.dtb
- dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb
- dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-b3.dtb \
+ kirkwood := \
++	kirkwood-b3.dtb \
  	kirkwood-cloudbox.dtb \
  	kirkwood-db-88f6281.dtb \
  	kirkwood-db-88f6282.dtb \
@@@ -125,24 -111,31 +125,27 @@@
  	kirkwood-nsa310a.dtb \
  	kirkwood-openblocks_a6.dtb \
  	kirkwood-openblocks_a7.dtb \
 +	kirkwood-rd88f6192.dtb \
 +	kirkwood-rd88f6281-a0.dtb \
 +	kirkwood-rd88f6281-a1.dtb \
 +	kirkwood-rs212.dtb \
 +	kirkwood-rs409.dtb \
 +	kirkwood-rs411.dtb \
  	kirkwood-sheevaplug.dtb \
  	kirkwood-sheevaplug-esata.dtb \
 +	kirkwood-t5325.dtb \
  	kirkwood-topkick.dtb \
  	kirkwood-ts219-6281.dtb \
 -	kirkwood-ts219-6282.dtb
 +	kirkwood-ts219-6282.dtb \
 +	kirkwood-ts419-6281.dtb \
 +	kirkwood-ts419-6282.dtb
+ dtb-$(CONFIG_ARCH_KIRKWOOD) += $(kirkwood)
+ dtb-$(CONFIG_MACH_KIRKWOOD) += $(kirkwood)
+ dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb
  dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
  dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb
 -dtb-$(CONFIG_ARCH_MSM) += qcom-msm8660-surf.dtb \
 -	qcom-msm8960-cdp.dtb \
 -	qcom-apq8074-dragonboard.dtb
 -dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
 -	armada-370-mirabox.dtb \
 -	armada-370-netgear-rn102.dtb \
 -	armada-370-netgear-rn104.dtb \
 -	armada-370-rd.dtb \
 -	armada-xp-axpwifiap.dtb \
 -	armada-xp-db.dtb \
 -	armada-xp-gp.dtb \
 -	armada-xp-netgear-rn2120.dtb \
 -	armada-xp-matrix.dtb \
 -	armada-xp-openblocks-ax3-4.dtb
  dtb-$(CONFIG_ARCH_MXC) += \
 +	imx25-eukrea-mbimxsd25-baseboard.dtb \
  	imx25-karo-tx25.dtb \
  	imx25-pdk.dtb \
  	imx27-apf27.dtb \