diff options
| author | Olof Johansson <olof@lixom.net> | 2014-03-11 21:23:09 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-03-11 21:23:18 +0100 |
| commit | 59bb376f0e0a2bf7103aa57b45faab9963b16c4f (patch) | |
| tree | c7ca8e16b8871d474b471c54526dbccfe03f87c2 /arch/arm/boot/dts/Makefile | |
| parent | Merge tag 'keystone-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/ssa... (diff) | |
| parent | ARM: dts: remove bcm11351-brt.dts (diff) | |
| download | linux-59bb376f0e0a2bf7103aa57b45faab9963b16c4f.tar.xz linux-59bb376f0e0a2bf7103aa57b45faab9963b16c4f.zip | |
Merge tag 'armsoc/for-3.15/dt' of git://github.com/broadcom/mach-bcm into next/dt
Merge "ARM: mach-bcm dt updates for 3.15" from Matt Porter:
- add BCM4708 dt support
- remove bcm11351-brt
- bcm281xx common clock support
* tag 'armsoc/for-3.15/dt' of git://github.com/broadcom/mach-bcm:
ARM: dts: remove bcm11351-brt.dts
ARM: dts: Leave sdio1 as disabled on bcm28155-ap
ARM: dts: bcm281xx: define real clocks
ARM: BCM5301X: add dts files for BCM4708 SoC
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, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 8f7bb77f4322..fa2814441e7e 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -47,9 +47,9 @@ dtb-$(CONFIG_ARCH_AT91) += sama5d36ek.dtb dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb -dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm11351-brt.dtb \ - bcm28155-ap.dtb +dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb +dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb dtb-$(CONFIG_ARCH_BERLIN) += \ berlin2-sony-nsz-gs7.dtb \ berlin2cd-google-chromecast.dtb |