diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-05 18:44:12 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-05 18:44:12 -0700 |
| commit | 2542f928b2131a0367e50a4390afc12084cc4cc4 (patch) | |
| tree | 5077c108a1f5d674a9e15545b1d31d7fb2e8ee3c /arch/arm/boot/dts/Makefile | |
| parent | 7de24debeadb75472449cf9ecef7700d0a4cd1d1 (diff) | |
| parent | 5a62ec57004f1a434bfd3feed43e447b5780baf6 (diff) | |
Merge tag 'renesas-dt2-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
Merge "Second Round of Renesas ARM Based SoC DT Updates for v3.16" from Simon
Horman:
* Add r8a7791 (R-Car M2) based Henninger board
* tag 'renesas-dt2-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: henninger: enable SATA0
ARM: shmobile: henninger: add Ether DT support
ARM: shmobile: henninger: initial device tree
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 377b7c364033..2f06c99586fc 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -315,6 +315,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \ sh7372-mackerel.dtb dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \ r7s72100-genmai-reference.dtb \ + r8a7791-henninger.dtb \ r8a7791-koelsch.dtb \ r8a7790-lager.dtb dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \ |