diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-23 13:58:01 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-23 13:58:01 -0800 |
| commit | 68f173f515bb8153c170eff691ae0ed3a2235709 (patch) | |
| tree | bd8995413fd127fe6eeb5546f84670fd7b7f9512 /arch/arm/boot/dts/Makefile | |
| parent | 362c9a778c8597d96d469123b0bf738e8479bcb1 (diff) | |
| parent | 5b1864b899d2b591402704dd0f6528c8661f1817 (diff) | |
Merge tag 'bcm5301x-dt-2015-01-20' of https://github.com/hauke/linux into next/dt
Merge "ARM: BCM5301X: DT changes for v3.20" from Hauke Mehrtens:
bcm5301x-dt-2015-01-20: ARM: BCM5301X: dts updates for 3.20
* tag 'bcm5301x-dt-2015-01-20' of https://github.com/hauke/linux:
ARM: BCM5301X: Add DT for Buffalo WZR-900DHP
ARM: BCM5301X: Add LEDs for Buffalo devices
ARM: BCM5301X: Drop unused poll-interval from gpio-keys
ARM: BCM5301X: Add DT for Luxul XWC-1000
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 17ee818d6583..bb55b6a84a6a 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -64,10 +64,12 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ bcm2835-rpi-b-plus.dtb dtb-$(CONFIG_ARCH_BCM_5301X) += \ bcm4708-buffalo-wzr-1750dhp.dtb \ + bcm4708-luxul-xwc-1000.dtb \ bcm4708-netgear-r6250.dtb \ bcm4708-netgear-r6300-v2.dtb \ bcm47081-asus-rt-n18u.dtb \ - bcm47081-buffalo-wzr-600dhp2.dtb + bcm47081-buffalo-wzr-600dhp2.dtb \ + bcm47081-buffalo-wzr-900dhp.dtb dtb-$(CONFIG_ARCH_BCM_63XX) += \ bcm963138dvt.dtb dtb-$(CONFIG_ARCH_BCM_CYGNUS) += \ |