Commit 9863b78a authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

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: default avatarAndi Kleen <ak@suse.de>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Ben LaHaise <bcrl@kvack.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2966c6a0
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
# Makefile for the generic architecture # 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/ obj-y := probe.o summit.o bigsmp.o es7000.o default.o ../mach-es7000/
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Makefile for the linux kernel. # 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-y := setup.o voyager_basic.o voyager_thread.o
obj-$(CONFIG_SMP) += voyager_smp.o voyager_cat.o obj-$(CONFIG_SMP) += voyager_smp.o voyager_cat.o
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment