git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'md/4.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
boot
/
dts
/
img
/
Makefile
diff --git
a/arch/mips/boot/dts/img/Makefile
b/arch/mips/boot/dts/img/Makefile
index 69a65f0f82d285c8cca0601ecf9650133f460a96..3d70958d0f5a2af800dda6d0263bd56476268f24 100644
(file)
--- a/
arch/mips/boot/dts/img/Makefile
+++ b/
arch/mips/boot/dts/img/Makefile
@@
-1,6
+1,7
@@
-dtb-$(CONFIG_
MACH_PISTACHIO) += pistachio_marduk
.dtb
+dtb-$(CONFIG_
FIT_IMAGE_FDT_BOSTON) += boston
.dtb
-obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
+dtb-$(CONFIG_MACH_PISTACHIO) += pistachio_marduk.dtb
+obj-$(CONFIG_MACH_PISTACHIO) += pistachio_marduk.dtb.o
# Force kbuild to make empty built-in.o if necessary
obj- += dummy.o
# Force kbuild to make empty built-in.o if necessary
obj- += dummy.o