Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[~andy/linux] / arch / xtensa / boot / Makefile

diff --git a/arch/xtensa/boot/Makefile b/arch/xtensa/boot/Makefile
index 196bc3c967af21e6ae2502ee7c298c0d08554caa..818647e815d7e4bb6812668d56f7db6f2d9d5c32 100644 (file)
--- a/arch/xtensa/boot/Makefile
+++ b/arch/xtensa/boot/Makefile
@@ -28,7 +28,7 @@ bootdir-$(CONFIG_XTENSA_PLATFORM_XTFPGA) += boot-redboot boot-elf boot-uboot
 
 BUILTIN_DTB := $(patsubst "%",%,$(CONFIG_BUILTIN_DTB)).dtb.o
 ifneq ($(CONFIG_BUILTIN_DTB),"")
-obj-y += $(BUILTIN_DTB)
+obj-$(CONFIG_OF) += $(BUILTIN_DTB)
 endif
 
 # Rule to build device tree blobs