diff options
| author | Olof Johansson <olof@lixom.net> | 2013-04-17 22:34:14 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-04-17 22:34:22 -0700 |
| commit | 392f9195646cf3bf3950537040eee04eea827c24 (patch) | |
| tree | 4b934a75be7e019ca58fb4293fe774817acce726 /arch/arm/boot/dts/Makefile | |
| parent | e1b1655a58cc719992aa17b2527f83146954fc0f (diff) | |
| parent | d3dde4df4483cefc614317a2ae550b20ef29f58c (diff) | |
Merge tag 'boards-3.10' of git://git.infradead.org/users/jcooper/linux into next/boards
From Jason Cooper:
mvebu boards for v3.10
- kirkwood
- Netgear ReadyNAS Duo v2
- add guruplug dt to defconfig
- Lacie Cloudbox
* tag 'boards-3.10' of git://git.infradead.org/users/jcooper/linux:
ARM: Kirkwood: update Network Space Mini v2 description
ARM: Kirkwood: DT board setup for CloudBox
ARM: Kirkwood: sort board entries by ASCII-code order
ARM: kirkwood: add MACH_GURUPLUG_DT to defconfig
ARM: kirkwood: Add support for NETGEAR ReadyNAS Duo v2 using DT
Signed-off-by: Olof Johansson <olof@lixom.net>
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 ee9fbe4d9912..c160215ab6d0 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -51,7 +51,8 @@ dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \ dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \ integratorcp.dtb dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb -dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \ +dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \ + kirkwood-dns320.dtb \ kirkwood-dns325.dtb \ kirkwood-dockstar.dtb \ kirkwood-dreamplug.dtb \ @@ -65,6 +66,7 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \ kirkwood-lschlv2.dtb \ kirkwood-lsxhl.dtb \ kirkwood-mplcec4.dtb \ + kirkwood-netgear_readynas_duo_v2.dtb \ kirkwood-ns2.dtb \ kirkwood-ns2lite.dtb \ kirkwood-ns2max.dtb \ |