aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-04-16 19:44:10 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-16 19:44:10 -0700
commitc208278c5c6ec815acfe4ea4701302edf8fe8a21 (patch)
tree9467e73962183233f35e939efcc0dc578ab598e3 /Makefile
parent8665ffc9215be1fe56f97500dad0440c9b644f5c (diff)
parenta54292f58fc16e3d09aecea16de3e58a898dde97 (diff)
downloadvexpress-lsk-c208278c5c6ec815acfe4ea4701302edf8fe8a21.tar.gz
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kbuild fix from Michal Marek: "Fix for a missing dependency when generating scripts/mod/devicetable-offsets.h. This dependency got introduced in v3.9-rc1." * 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: kbuild: generate generic headers before recursing into scripts
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 9cf6783c2ec..ac509b25b70 100644
--- a/Makefile
+++ b/Makefile
@@ -513,7 +513,8 @@ ifeq ($(KBUILD_EXTMOD),)
# Carefully list dependencies so we do not try to build scripts twice
# in parallel
PHONY += scripts
-scripts: scripts_basic include/config/auto.conf include/config/tristate.conf
+scripts: scripts_basic include/config/auto.conf include/config/tristate.conf \
+ asm-generic
$(Q)$(MAKE) $(build)=$(@)
# Objects we will link into vmlinux / subdirs we need to visit