From 2e98664f4018d6353a7f71558282793eb1dc98c4 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Fri, 13 Oct 2006 16:04:23 +0100
Subject: [PATCH] --- yaml --- r: 39557 b: refs/heads/master c:
 0e7af8d04ecb4f6ba8cd1f731f036a004ad0e174 h: refs/heads/master i:   39555:
 1afa826e406c5897417b76c2ddbd065e25720104 v: v3

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

diff --git a/[refs] b/[refs]
index bd0eeb585a13..8c0793344df4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0fafda36a2fc5ecf8d11771f6c01c523b2a1fd8
+refs/heads/master: 0e7af8d04ecb4f6ba8cd1f731f036a004ad0e174
diff --git a/trunk/Makefile b/trunk/Makefile
index f242829c4f0b..eebf310e8ce4 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -742,7 +742,7 @@ endif # ifdef CONFIG_KALLSYMS
 # vmlinux image - including updated kernel symbols
 vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) $(kallsyms.o) FORCE
 ifdef CONFIG_HEADERS_CHECK
-	$(Q)$(MAKE) headers_check
+	$(Q)$(MAKE) -f $(srctree)/Makefile headers_check
 endif
 	$(call if_changed_rule,vmlinux__)
 	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost $@
@@ -935,7 +935,7 @@ headers_install_all: include/linux/version.h scripts_basic FORCE
 
 PHONY += headers_install
 headers_install: include/linux/version.h scripts_basic FORCE
-	@if [ ! -r include/asm-$(ARCH)/Kbuild ]; then \
+	@if [ ! -r $(srctree)/include/asm-$(ARCH)/Kbuild ]; then \
 	  echo '*** Error: Headers not exportable for this architecture ($(ARCH))'; \
 	  exit 1 ; fi
 	$(Q)$(MAKE) $(build)=scripts scripts/unifdef