summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/Makefile
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2017-01-12 16:10:00 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2017-01-12 16:10:00 +0800
commit4cf0662888026d5c1b62ed3fa8dc048a2ff2e124 (patch)
treea5c92c5024c599a00bfd8d402d2b7b0a619b0259 /arch/arm/boot/dts/Makefile
parentc821f6ab2e47946f35ee2f30781c5185e5d07f65 (diff)
parenta121103c922847ba5010819a3f250f1f7fc84ab8 (diff)
downloadop-kernel-dev-4cf0662888026d5c1b62ed3fa8dc048a2ff2e124.zip
op-kernel-dev-4cf0662888026d5c1b62ed3fa8dc048a2ff2e124.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merging 4.10-rc3 so that the cryptodev tree builds on ARM64.
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
-rw-r--r--arch/arm/boot/dts/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index cccdbcb..7327250 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -501,6 +501,7 @@ dtb-$(CONFIG_ARCH_OMAP3) += \
am3517-evm.dtb \
am3517_mt_ventoux.dtb \
logicpd-torpedo-37xx-devkit.dtb \
+ logicpd-som-lv-37xx-devkit.dtb \
omap3430-sdp.dtb \
omap3-beagle.dtb \
omap3-beagle-xm.dtb \
OpenPOWER on IntegriCloud