diff --git a/[refs] b/[refs]
index 00756d14b378..7c1ca822bc6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2966c6a03efd90197582eae8590d82c789475680
+refs/heads/master: 9863b78a1a82347fa1e727bdca0110151a5c4f10
diff --git a/trunk/arch/i386/mach-generic/Makefile b/trunk/arch/i386/mach-generic/Makefile
index 77fbc9f64fbc..6914485c0d85 100644
--- a/trunk/arch/i386/mach-generic/Makefile
+++ b/trunk/arch/i386/mach-generic/Makefile
@@ -2,6 +2,6 @@
 # Makefile for the generic architecture
 #
 
-EXTRA_CFLAGS	+= -I../kernel
+EXTRA_CFLAGS	:= -Iarch/i386/kernel
 
 obj-y				:= probe.o summit.o bigsmp.o es7000.o default.o ../mach-es7000/
diff --git a/trunk/arch/i386/mach-voyager/Makefile b/trunk/arch/i386/mach-voyager/Makefile
index f24d29651318..33b74cf0dd22 100644
--- a/trunk/arch/i386/mach-voyager/Makefile
+++ b/trunk/arch/i386/mach-voyager/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the linux kernel.
 #
 
-EXTRA_CFLAGS	+= -I../kernel
+EXTRA_CFLAGS	:= -Iarch/i386/kernel
 obj-y			:= setup.o voyager_basic.o voyager_thread.o
 
 obj-$(CONFIG_SMP)	+= voyager_smp.o voyager_cat.o