diff options
| author | Andi Kleen <ak@suse.de> | 2007-09-11 14:02:12 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-12 18:28:06 +0200 |
| commit | 9863b78a1a82347fa1e727bdca0110151a5c4f10 (patch) | |
| tree | 470016dc13ec85321f242ba537d911ffdd6908e2 | |
| parent | x86_64: Prevent doing anything from cache_remove_dev() when info setup failed. (diff) | |
| download | linux-9863b78a1a82347fa1e727bdca0110151a5c4f10.tar.xz linux-9863b78a1a82347fa1e727bdca0110151a5c4f10.zip | |
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 <ak@suse.de>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Ben LaHaise <bcrl@kvack.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/i386/mach-generic/Makefile | 2 | ||||
| -rw-r--r-- | arch/i386/mach-voyager/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/mach-generic/Makefile b/arch/i386/mach-generic/Makefile index 77fbc9f64fbc..6914485c0d85 100644 --- 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 f24d29651318..33b74cf0dd22 100644 --- 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 |