diff --git a/[refs] b/[refs] index 3900e1307180..b550fabd5ba5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e06b8b98da071f7dd78fb7822991694288047df0 +refs/heads/master: cf87dcd14064e7660f2b11b35b9e4949e9812fd2 diff --git a/trunk/Makefile b/trunk/Makefile index d73865188372..0d585c09d60c 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -811,7 +811,9 @@ endif $(Q)rm -f .old_version # build vmlinux.o first to catch section mismatch errors early -$(kallsyms.o): vmlinux.o +ifdef CONFIG_KALLSYMS +.tmp_vmlinux1: vmlinux.o +endif vmlinux.o: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) FORCE $(call if_changed_rule,vmlinux-modpost)