diff options
| author | Olof Johansson <olof@lixom.net> | 2013-10-31 10:34:01 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-10-31 10:34:20 -0700 |
| commit | 07eb663b7ec7fdb9c325e22e83f5975c724b6249 (patch) | |
| tree | d8a4189703dd98a20d1e4c5fceff5f193f305da9 /arch/arm/boot/dts/Makefile | |
| parent | ed76956f7089e34052a475fd13a903d2b69e381b (diff) | |
| parent | 45e8815fc1b7ed66729bbbc9464228ee1769b580 (diff) | |
| download | blackbird-op-linux-07eb663b7ec7fdb9c325e22e83f5975c724b6249.tar.gz blackbird-op-linux-07eb663b7ec7fdb9c325e22e83f5975c724b6249.zip | |
Merge tag 'dt-3.13-5' of git://git.infradead.org/linux-mvebu into next/dt
From Jason Cooper:
- add the Openblocks A7 board
- add Netgear ReadyNAS 104 board
* tag 'dt-3.13-5' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: Add Netgear ReadyNAS 104 board
ARM: kirkwood: add support for OpenBlocks A7 platform
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 5ba6e32f3016..6ce9d1d76420 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -96,18 +96,20 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \ kirkwood-ns2mini.dtb \ kirkwood-nsa310.dtb \ kirkwood-nsa310a.dtb \ + kirkwood-openblocks_a6.dtb \ + kirkwood-openblocks_a7.dtb \ kirkwood-sheevaplug.dtb \ kirkwood-sheevaplug-esata.dtb \ kirkwood-topkick.dtb \ kirkwood-ts219-6281.dtb \ - kirkwood-ts219-6282.dtb \ - kirkwood-openblocks_a6.dtb + kirkwood-ts219-6282.dtb dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \ msm8960-cdp.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 \ |
