Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/i386/mach-generic/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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/

arch/i386/mach-voyager/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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