[PATCH for 2.6.23] [3/3] i386: Fix leak of ../kernel from top level

[Andi Kleen]

Fix a compile error when the directory above the kernel source contains
a file named "kernel". Originally from Ben La Haise, modified based
on feedback from Sam Ravnborg

Cc: sam@xxxxxxxxxxxx
Cc: bcrl@xxxxxxxxx

Signed-off-by: Andi Kleen <ak@xxxxxxx>

Index: linux/arch/i386/mach-generic/Makefile
===================================================================
--- linux.orig/arch/i386/mach-generic/Makefile
+++ linux/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/
Index: linux/arch/i386/mach-voyager/Makefile
===================================================================
--- linux.orig/arch/i386/mach-voyager/Makefile
+++ linux/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
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/