path: root/kernel/Makefile
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-14 19:59:37 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-14 19:59:37 -0700
commitc91d7d54ea9e75ec18c733969ba16dd7ab94fc99 (patch)
tree5b93c6931adf9908f9f207eaa7a0f91d8207ad08 /kernel/Makefile
parent133309a89e7430f907ebe85e78906ee12c311727 (diff)
parent48586218b6515b9bd70694e3cd8c901a6a6ee69c (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/Makefile')
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
$(call if_changed,gzip)
quiet_cmd_ikconfiggz = IKCFG $@
- cmd_ikconfiggz = (echo "static const char kernel_config_data[] = MAGIC_START"; cat $< | scripts/bin2c; echo "MAGIC_END;") > $@
+ cmd_ikconfiggz = (echo "static const char kernel_config_data[] __used = MAGIC_START"; cat $< | scripts/bin2c; echo "MAGIC_END;") > $@
targets += config_data.h
$(obj)/config_data.h: $(obj)/config_data.gz FORCE
$(call if_changed,ikconfiggz)

Privacy Policy