diff options
| author | Olof Johansson <olof@lixom.net> | 2013-08-29 10:49:03 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-09-03 10:20:05 -0700 |
| commit | 103c6a71207f80e6ecfeba2c21d6246687bb0ee4 (patch) | |
| tree | a69dc44415f138264b7180797ce7f0f71f87a884 /arch/arm/boot/dts/Makefile | |
| parent | ef8932b94a441a189aaca15ef1b86d9e46b3f933 (diff) | |
| parent | 15e22ddf045ed9796d0d2302e759aa7a37826523 (diff) | |
| download | talos-op-linux-103c6a71207f80e6ecfeba2c21d6246687bb0ee4.tar.gz talos-op-linux-103c6a71207f80e6ecfeba2c21d6246687bb0ee4.zip | |
Merge branch 'armsoc/for-3.12/dt' of git://github.com/broadcom/bcm11351 into next/dt
From Christian Daudt, DT changes for Broadcom.
* 'armsoc/for-3.12/dt' of git://github.com/broadcom/bcm11351:
ARM: DT: binding fixup to align with vendor-prefixes.txt (DT)
ARM: dts: add sdio blocks to bcm28155-ap board
ARM: dts: align sdio numbers to HW definition
ARM: bcm281xx: DT changes for reboot code
ARM: bcm281xx: Adding bcm28155-ap.dts
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index a4916875b00b..454288db3180 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -42,7 +42,8 @@ dtb-$(CONFIG_ARCH_AT91) += sama5d34ek.dtb dtb-$(CONFIG_ARCH_AT91) += sama5d35ek.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb -dtb-$(CONFIG_ARCH_BCM) += bcm11351-brt.dtb +dtb-$(CONFIG_ARCH_BCM) += bcm11351-brt.dtb \ + bcm28155-ap.dtb dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \ da850-evm.dtb dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \ |
