diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-14 22:59:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-14 22:59:37 -0400 |
| commit | c91d7d54ea9e75ec18c733969ba16dd7ab94fc99 (patch) | |
| tree | 5b93c6931adf9908f9f207eaa7a0f91d8207ad08 /kernel | |
| parent | 133309a89e7430f907ebe85e78906ee12c311727 (diff) | |
| parent | 48586218b6515b9bd70694e3cd8c901a6a6ee69c (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig:
kconfig: add missing dependency of conf to localyesconfig
kconfig: test if a .config already exists
kconfig: make local .config default for streamline_config
kconfig: test for /boot/config-uname after /proc/config.gz in localconfig
kconfig: unset IKCONFIG_PROC and clean up nesting
kconfig: search for a config to base the local(mod|yes)config on
kconfig: keep config.gz around even if CONFIG_IKCONFIG_PROC is not set
kconfig: have extract-ikconfig read ELF files
kconfig: add check if end exists in extract-ikconfig
kconfig: enable CONFIG_IKCONFIG from streamline_config.pl
kconfig: do not warn about modules built in
kconfig: streamline_config.pl do not stop with no depends
kconfig: add make localyesconfig option
kconfig: make localmodconfig to run streamline_config.pl
kconfig: add streamline_config.pl to scripts
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 b833bd5cc127..961379caf666 100644 --- a/kernel/Makefile +++ b/kernel/Makefile | |||
| @@ -117,7 +117,7 @@ $(obj)/config_data.gz: .config FORCE | |||
| 117 | $(call if_changed,gzip) | 117 | $(call if_changed,gzip) |
| 118 | 118 | ||
| 119 | quiet_cmd_ikconfiggz = IKCFG $@ | 119 | quiet_cmd_ikconfiggz = IKCFG $@ |
| 120 | cmd_ikconfiggz = (echo "static const char kernel_config_data[] = MAGIC_START"; cat $< | scripts/bin2c; echo "MAGIC_END;") > $@ | 120 | cmd_ikconfiggz = (echo "static const char kernel_config_data[] __used = MAGIC_START"; cat $< | scripts/bin2c; echo "MAGIC_END;") > $@ |
| 121 | targets += config_data.h | 121 | targets += config_data.h |
| 122 | $(obj)/config_data.h: $(obj)/config_data.gz FORCE | 122 | $(obj)/config_data.h: $(obj)/config_data.gz FORCE |
| 123 | $(call if_changed,ikconfiggz) | 123 | $(call if_changed,ikconfiggz) |