diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-10 11:27:52 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-10 11:27:52 -0500 |
commit | 0c05384a5a1af2352b8c244cf32f480ba6cbf024 (patch) | |
tree | 5090f9d2d07d0bccae3144bb0cdbdf15e8555013 /kernel | |
parent | 1542dec1c9109fdcd1c53460f064096f24fc49d2 (diff) | |
parent | bc91c9f313309915f6ec767f56f78dcd0305b20f (diff) |
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
mkuboot.sh: Fail if mkimage is missing
gen_init_cpio: checkpatch fixes
gen_init_cpio: Avoid race between call to stat() and call to open()
modpost: Fix address calculation in reloc_location()
Make fixdep error handling more explicit
checksyscalls: Fix stand-alone usage
modpost: Put .zdebug* section on white list
kbuild: fix interaction of CONFIG_IKCONFIG and KCONFIG_CONFIG
kbuild: export linux/{a.out,kvm,kvm_para}.h on headers_install_all
kbuild: introduce HDR_ARCH_LIST for headers_install_all
headers_install: check exit status of unifdef
gen_init_cpio: remove leading `/' from file names
scripts/genksyms: fix header usage
fixdep: use hash table instead of a single array
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index 0b5ff083fa22..33e0a39cf359 100644 --- a/kernel/Makefile +++ b/kernel/Makefile | |||
@@ -121,7 +121,7 @@ $(obj)/configs.o: $(obj)/config_data.h | |||
121 | # config_data.h contains the same information as ikconfig.h but gzipped. | 121 | # config_data.h contains the same information as ikconfig.h but gzipped. |
122 | # Info from config_data can be extracted from /proc/config* | 122 | # Info from config_data can be extracted from /proc/config* |
123 | targets += config_data.gz | 123 | targets += config_data.gz |
124 | $(obj)/config_data.gz: .config FORCE | 124 | $(obj)/config_data.gz: $(KCONFIG_CONFIG) FORCE |
125 | $(call if_changed,gzip) | 125 | $(call if_changed,gzip) |
126 | 126 | ||
127 | quiet_cmd_ikconfiggz = IKCFG $@ | 127 | quiet_cmd_ikconfiggz = IKCFG $@ |