aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/boot/Makefile
diff options
context:
space:
mode:
authorAndrey Konovalov <andrey.konovalov@linaro.org>2015-06-01 15:59:07 +0300
committerAndrey Konovalov <andrey.konovalov@linaro.org>2015-06-01 15:59:07 +0300
commit9fd096364296791b3d1fc8827f2694d8eec54e21 (patch)
tree0dd6f7aa953fe0dfc502541fdbe8c79a7258ecef /arch/arm/boot/Makefile
parentfb12e0df3039896778718ec0224f5f8c0ac604f9 (diff)
parentfc0481efeede37c1ccdb2f16bfdc3fe4d9f4c815 (diff)
Merge branch 'tracking-linaro-android-llct' into merge-linux-linaro-core-tracking
Diffstat (limited to 'arch/arm/boot/Makefile')
-rw-r--r--arch/arm/boot/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
index 9eca7aee927f..b28e3b34d205 100644
--- a/arch/arm/boot/Makefile
+++ b/arch/arm/boot/Makefile
@@ -14,6 +14,7 @@
ifneq ($(MACHINE),)
include $(MACHINE)/Makefile.boot
endif
+include $(srctree)/arch/arm/boot/dts/Makefile
# Note: the following conditions must always be true:
# ZRELADDR == virt_to_phys(PAGE_OFFSET + TEXT_OFFSET)