diff --git a/[refs] b/[refs] index 4d0d2e7aed00..6aff5dd6992d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba9effa2ecdc08325bd297d541b4207b2df38184 +refs/heads/master: 41263fc6716dea402125c95f38ed83ebf59d5172 diff --git a/trunk/Makefile b/trunk/Makefile index 6619720f50dd..ee77a3d88e0a 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -224,6 +224,7 @@ ifeq ($(ARCH),m68knommu) endif KCONFIG_CONFIG ?= .config +export KCONFIG_CONFIG # SHELL used by kbuild CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ diff --git a/trunk/kernel/Makefile b/trunk/kernel/Makefile index 0b5ff083fa22..33e0a39cf359 100644 --- a/trunk/kernel/Makefile +++ b/trunk/kernel/Makefile @@ -121,7 +121,7 @@ $(obj)/configs.o: $(obj)/config_data.h # config_data.h contains the same information as ikconfig.h but gzipped. # Info from config_data can be extracted from /proc/config* targets += config_data.gz -$(obj)/config_data.gz: .config FORCE +$(obj)/config_data.gz: $(KCONFIG_CONFIG) FORCE $(call if_changed,gzip) quiet_cmd_ikconfiggz = IKCFG $@