diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-07 10:56:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-07 10:56:26 -0400 |
commit | 57c29bd3cdf1f82a7ba79ea227638b14f607247c (patch) | |
tree | 285e3ce20ebae4b4913aeee0160c90ff10b549e1 /scripts/mod | |
parent | 383da76f5261637b8beacb99a83f5834b14fc432 (diff) | |
parent | 22fc4273c7fd6091abba1beab3dd487715c65540 (diff) |
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kbuild changes from Michal Marek:
"Kbuild commits for v3.10-rc1:
- Fix make mrproper after mod/file2alias rework
- Fix ld-option Makefile function
- Rewrite headers_install to shell to drop Perl dependency.
There are some more patches I have to look at, so I might send another
pull request later. Or just queue them for 3.11."
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
Fix cleaning in scripts/mod
headers_install.pl: convert to headers_install.sh
kbuild: fix ld-option function
Diffstat (limited to 'scripts/mod')
-rw-r--r-- | scripts/mod/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/mod/Makefile b/scripts/mod/Makefile index 9415b5663364..75d59fcd48b8 100644 --- a/scripts/mod/Makefile +++ b/scripts/mod/Makefile | |||
@@ -37,6 +37,8 @@ scripts/mod/devicetable-offsets.s: scripts/mod/devicetable-offsets.c FORCE | |||
37 | $(obj)/$(devicetable-offsets-file): scripts/mod/devicetable-offsets.s | 37 | $(obj)/$(devicetable-offsets-file): scripts/mod/devicetable-offsets.s |
38 | $(call cmd,offsets) | 38 | $(call cmd,offsets) |
39 | 39 | ||
40 | targets += $(devicetable-offsets-file) | ||
41 | |||
40 | # dependencies on generated files need to be listed explicitly | 42 | # dependencies on generated files need to be listed explicitly |
41 | 43 | ||
42 | $(obj)/modpost.o $(obj)/file2alias.o $(obj)/sumversion.o: $(obj)/elfconfig.h | 44 | $(obj)/modpost.o $(obj)/file2alias.o $(obj)/sumversion.o: $(obj)/elfconfig.h |