From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 17 Apr 2013 02:44:10 +0000 (-0700)
Subject: Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
X-Git-Tag: firefly_0821_release~3680^2~725
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=c208278c5c6ec815acfe4ea4701302edf8fe8a21;hp=8665ffc9215be1fe56f97500dad0440c9b644f5c;p=firefly-linux-kernel-4.4.55.git

Merge branch 'rc-fixes' of git://git./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
---

diff --git a/Makefile b/Makefile
index 9cf6783c2ec3..ac509b25b701 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