i386: Fix leak of ../kernel from top level

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

Signed-off-by: Andi Kleen <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Cc: Ben LaHaise <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/arch/i386/mach-generic/Makefile b/arch/i386/mach-generic/Makefile
index 77fbc9f64fbc58dea3c44318b8e61c1153f55dec..6914485c0d85d49429b5eda01f52de5670f1bd9e 100644 (file)
--- a/arch/i386/mach-generic/Makefile
+++ b/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/arch/i386/mach-voyager/Makefile b/arch/i386/mach-voyager/Makefile
index f24d2965131803c1a388506c23f06d2e9650d9da..33b74cf0dd220da24d09d3559fc2b4047d9abf9c 100644 (file)
--- a/arch/i386/mach-voyager/Makefile
+++ b/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