Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9863b78a1a82347fa1e727bdca0110151a5c4f10
Commit:     9863b78a1a82347fa1e727bdca0110151a5c4f10
Parent:     2966c6a03efd90197582eae8590d82c789475680
Author:     Andi Kleen <[EMAIL PROTECTED]>
AuthorDate: Tue Sep 11 14:02:12 2007 +0200
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Wed Sep 12 09:28:06 2007 -0700

    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]>
---
 arch/i386/mach-generic/Makefile |    2 +-
 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 77fbc9f..6914485 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 f24d296..33b74cf 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
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to