From cbee7d4209bb0775c3eb0ebd65874c14155907aa Mon Sep 17 00:00:00 2001
From: Matt Fleming <matt.fleming@intel.com>
Date: Tue, 28 Feb 2012 13:37:23 +0000
Subject: [PATCH] --- yaml --- r: 292739 b: refs/heads/master c:
 d40f833630a1299fd377408dc8d8fac370d621b0 h: refs/heads/master i:   292737:
 24fdacb1a83088b79a84876a0e656cc2c2f2f939   292735:
 878d44e9de26729a827fdfe5e8b52c5bc80b9726 v: v3

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

diff --git a/[refs] b/[refs]
index 70d62447c8a1..4140b36666d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12871c568305a0b20f116315479a18cd46882e9b
+refs/heads/master: d40f833630a1299fd377408dc8d8fac370d621b0
diff --git a/trunk/arch/x86/boot/Makefile b/trunk/arch/x86/boot/Makefile
index 95365a82b6a0..3e02148bb774 100644
--- a/trunk/arch/x86/boot/Makefile
+++ b/trunk/arch/x86/boot/Makefile
@@ -37,8 +37,9 @@ setup-y		+= video-bios.o
 targets		+= $(setup-y)
 hostprogs-y	:= mkcpustr tools/build
 
-HOST_EXTRACFLAGS += $(LINUXINCLUDE)
-
+HOSTCFLAGS_mkcpustr.o := -I$(srctree)/arch/$(SRCARCH)/include
+HOST_EXTRACFLAGS += -I$(objtree)/include -I$(srctree)/tools/include \
+                   -include $(srctree)/include/linux/kconfig.h
 $(obj)/cpu.o: $(obj)/cpustr.h
 
 quiet_cmd_cpustr = CPUSTR  $@