aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Huang2017-08-19 05:01:05 -0500
committerDavid Huang2017-08-19 05:01:05 -0500
commitc0dd023d7a10b2e12b2289e29760f9ac2b977212 (patch)
tree0bcd0d47b31e008176353a2ca0b79e5323c84968
parent909f69699b77fb678d84076fe197b69d7ae1e27b (diff)
parent4a30570aa68d5caf087c67adea0e49186d69e1f0 (diff)
downloadkernel-omap-c0dd023d7a10b2e12b2289e29760f9ac2b977212.tar.gz
kernel-omap-c0dd023d7a10b2e12b2289e29760f9ac2b977212.tar.xz
kernel-omap-c0dd023d7a10b2e12b2289e29760f9ac2b977212.zip
Merge branch 'p-ti-lsk-linux-4.4.y-next' of git://git.omapzoom.org/kernel/omap into p-ti-lsk-android-linux-4.4.y
Auto Merge of: TI-Feature: linux-4.4.y-next_android-4.4.y TI-Tree: git://git.omapzoom.org/kernel/omap.git TI-Branch: p-ti-lsk-linux-4.4.y-next * 'p-ti-lsk-linux-4.4.y-next' of git://git.omapzoom.org/kernel/omap: arm: dts: dra76: enable auo fpdlink display Signed-off-by: David Huang <d-huang@ti.com>
-rw-r--r--arch/arm/boot/dts/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 8b28d3badaea..8c57745523e4 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -523,7 +523,8 @@ dtb-$(CONFIG_SOC_DRA7XX) += \
523 dra72-evm-vision.dtb \ 523 dra72-evm-vision.dtb \
524 dra71-evm.dtb \ 524 dra71-evm.dtb \
525 dra71-evm-lcd-auo-g101evn01.0.dtb \ 525 dra71-evm-lcd-auo-g101evn01.0.dtb \
526 dra76-evm.dtb 526 dra76-evm.dtb \
527 dra76-evm-fpd-auo-g101evn01.0.dtb
527dtb-$(CONFIG_ARCH_ORION5X) += \ 528dtb-$(CONFIG_ARCH_ORION5X) += \
528 orion5x-lacie-d2-network.dtb \ 529 orion5x-lacie-d2-network.dtb \
529 orion5x-lacie-ethernet-disk-mini-v2.dtb \ 530 orion5x-lacie-ethernet-disk-mini-v2.dtb \