projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
boot
/
Makefile
diff --git
a/arch/arm/boot/Makefile
b/arch/arm/boot/Makefile
index 84aa2caf07ed203fb810220258401a1b51f7cab3..085bb96493a373d7c2e2a17b20bf49f17b173f08 100644
(file)
--- a/
arch/arm/boot/Makefile
+++ b/
arch/arm/boot/Makefile
@@
-14,6
+14,7
@@
ifneq ($(MACHINE),)
include $(srctree)/$(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)