diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-11-30 23:46:47 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-11-30 23:46:47 +0100 |
| commit | f76d02e2d164bdcb939a0261c5f453c63a3da86c (patch) | |
| tree | 1edf3dd6f4a75dc63eaf9d41e264e0208eda3ddb /arch/arm/boot/dts/Makefile | |
| parent | 54137bf6112db699329cbe915ea7332c8cbbeace (diff) | |
| parent | 26ca8b52d6e18c10109cabda0f775dd9345bbfdf (diff) | |
| download | lwn-f76d02e2d164bdcb939a0261c5f453c63a3da86c.tar.gz lwn-f76d02e2d164bdcb939a0261c5f453c63a3da86c.zip | |
Merge tag 'mvebu-dt-4.10-2' of git://git.infradead.org/linux-mvebu into next/dt
Pull "mvebu dt for 4.10 (part 1)" from Gregory CLEMENT:
Add Turris Omnia support, an open hardware router Armada 385 based
* tag 'mvebu-dt-4.10-2' of git://git.infradead.org/linux-mvebu:
ARM: dts: add support for Turris Omnia
devicetree: Add vendor prefix for CZ.NIC
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 01b77cea3a55..f61c48704f2d 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -945,6 +945,7 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \ armada-385-db-ap.dtb \ armada-385-linksys-caiman.dtb \ armada-385-linksys-cobra.dtb \ + armada-385-turris-omnia.dtb \ armada-388-clearfog.dtb \ armada-388-db.dtb \ armada-388-gp.dtb \ |