summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-02-22 16:09:55 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2019-02-22 16:09:55 -0800
commit77dc1181d896c5c3f8e131e341993aef41e16505 (patch)
tree37b69006f5a2fcbc04a3bb1148a082f948836d51 /arch
parent6ee2846cb4e7c6e8acdcb265299ad1c6de42b437 (diff)
parent207a369e3c085799e7836221f64e7a7329985fb6 (diff)
downloadlinux-77dc1181d896c5c3f8e131e341993aef41e16505.tar.bz2
Merge tag 'kbuild-fixes-v5.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull more Kbuild fixes from Masahiro Yamada: - fix scripts/kallsyms.c to correctly check too long symbol names - fix sh build error for the combination of CONFIG_OF_EARLY_FLATTREE=y and CONFIG_USE_BUILTIN_DTB=n * tag 'kbuild-fixes-v5.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: sh: fix build error for invisible CONFIG_BUILTIN_DTB_SOURCE kallsyms: Handle too long symbols in kallsyms.c
Diffstat (limited to 'arch')
-rw-r--r--arch/sh/boot/dts/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/boot/dts/Makefile b/arch/sh/boot/dts/Makefile
index 01d0f7fb14cc..2563d1e532e2 100644
--- a/arch/sh/boot/dts/Makefile
+++ b/arch/sh/boot/dts/Makefile
@@ -1,3 +1,3 @@
ifneq ($(CONFIG_BUILTIN_DTB_SOURCE),"")
-obj-y += $(patsubst "%",%,$(CONFIG_BUILTIN_DTB_SOURCE)).dtb.o
+obj-$(CONFIG_USE_BUILTIN_DTB) += $(patsubst "%",%,$(CONFIG_BUILTIN_DTB_SOURCE)).dtb.o
endif