diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-23 17:17:15 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-23 17:17:15 -0500 |
| commit | fd10a2e4113971f42c05796b8a487fdf10d32c48 (patch) | |
| tree | d76a77815f585ee7ad106e4a3dfe83825160cd52 /arch/arm/boot/dts/Makefile | |
| parent | 8739f728dba738f1d6f0da2d3d19cf92ed4b7e32 (diff) | |
| parent | 6cc082a84e13f3a0078973a08adf22f1404acc3d (diff) | |
Merge tag 'mvebu-dt-3.20-2' of git://git.infradead.org/linux-mvebu into next/dt
Merge "mvebu/dt #2" from Andrew Lunn:
Second set of dt patches for mvebu for v3.20.
* tag 'mvebu-dt-3.20-2' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: make DTS comments reflect DEBUG_LL changes
ARM: mvebu: Armada 385 GP: Add regulators to the SATA port
ARM: Kirkwood: Added support for pogoplug e02 (pink/gray)
ARM: mvebu: fix compatible strings of MBus on Armada 375 and Armada 38x
dt: bindings: update mvebu-mbus DT binding with new compatible properties
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index bb55b6a84a6a..89b732b6d6cf 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile | |||
| @@ -187,6 +187,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \ | |||
| 187 | kirkwood-openrd-base.dtb \ | 187 | kirkwood-openrd-base.dtb \ |
| 188 | kirkwood-openrd-client.dtb \ | 188 | kirkwood-openrd-client.dtb \ |
| 189 | kirkwood-openrd-ultimate.dtb \ | 189 | kirkwood-openrd-ultimate.dtb \ |
| 190 | kirkwood-pogo_e02.dtb \ | ||
| 190 | kirkwood-rd88f6192.dtb \ | 191 | kirkwood-rd88f6192.dtb \ |
| 191 | kirkwood-rd88f6281-z0.dtb \ | 192 | kirkwood-rd88f6281-z0.dtb \ |
| 192 | kirkwood-rd88f6281-a.dtb \ | 193 | kirkwood-rd88f6281-a.dtb \ |