From 0ad273217df7a4b763f01d14028ea402859b8044 Mon Sep 17 00:00:00 2001
From: Ben Gardiner <bengardiner@nanometrics.ca>
Date: Tue, 14 Dec 2010 11:39:44 -0500
Subject: [PATCH] --- yaml --- r: 227647 b: refs/heads/master c:
 41263fc6716dea402125c95f38ed83ebf59d5172 h: refs/heads/master i:   227645:
 c469ca75b60227265ac3990469195f1238b4acb9   227643:
 c8211238476a66dc9c1b24066e21e2033d277dac   227639:
 a68b95e63d91c179bcd254cf9e6504aef6664c02   227631:
 68ac56217abb79db79e23f2f626e1d05e7f42df7   227615:
 490c5ebb605029e848297a07462de3620c32f6a1   227583:
 c9211b4ecbb072ea6a69ad29d29559f31e7da8fd v: v3

---
 [refs]                | 2 +-
 trunk/Makefile        | 1 +
 trunk/kernel/Makefile | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

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   $@