Skip to content

Commit

Permalink
i386: Fix leak of ../kernel from top level
Browse files Browse the repository at this point in the history
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 <ak@suse.de>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Ben LaHaise <bcrl@kvack.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Andi Kleen authored and Linus Torvalds committed Sep 12, 2007
1 parent 2966c6a commit 9863b78
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion arch/i386/mach-generic/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
2 changes: 1 addition & 1 deletion arch/i386/mach-voyager/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 9863b78

Please sign in to comment.