diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-11-20 23:09:20 +0100 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-11-20 23:09:20 +0100 |
commit | 05e121af947aa59647762aaf3773b6f53f498f67 (patch) | |
tree | d9697c5b3d78396ecb98d251a35e856bbf24118c /arch/arm/boot/dts/Makefile | |
parent | bb4f6ce2f3683e11e79d923eac945e49ddb6df4a (diff) | |
parent | 9f32cccc67590ccda30529bcbcea5c22d95c00a6 (diff) | |
download | linux-3.10-05e121af947aa59647762aaf3773b6f53f498f67.tar.gz linux-3.10-05e121af947aa59647762aaf3773b6f53f498f67.tar.bz2 linux-3.10-05e121af947aa59647762aaf3773b6f53f498f67.zip |
Merge tag 'marvell-boards-net-for-3.8' of github.com:MISL-EBU-System-SW/mainline-public into test-the-merge
Marvell boards changes related to Ethernet, for 3.8
Conflicts:
arch/arm/boot/dts/armada-370-xp.dtsi
arch/arm/boot/dts/armada-xp-db.dts
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
-rw-r--r-- | arch/arm/boot/dts/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index f37cf9fa5fa..32d1d404924 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -44,7 +44,9 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \ dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \ msm8960-cdp.dtb dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \ - armada-xp-db.dtb + armada-370-mirabox.dtb \ + armada-xp-db.dtb \ + armada-xp-openblocks-ax3-4.dtb dtb-$(CONFIG_ARCH_MXC) += imx51-babbage.dtb \ imx53-ard.dtb \ imx53-evk.dtb \ |