more x86 merge fallout (uml, again)

arch/i386/{Kconfig,Makefile}.cpu got moved

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Al Viro 2007-10-29 04:34:31 +00:00 committed by Linus Torvalds
parent ca5cd877ae
commit 7a78a17223
2 changed files with 2 additions and 2 deletions

View File

@ -1,6 +1,6 @@
menu "Host processor type and features"
source "arch/i386/Kconfig.cpu"
source "arch/x86/Kconfig.cpu"
endmenu

View File

@ -28,7 +28,7 @@ CONFIG_X86_32 := y
export CONFIG_X86_32
# First of all, tune CFLAGS for the specific CPU. This actually sets cflags-y.
include $(srctree)/arch/i386/Makefile.cpu
include $(srctree)/arch/x86/Makefile_32.cpu
# prevent gcc from keeping the stack 16 byte aligned. Taken from i386.
cflags-y += $(call cc-option,-mpreferred-stack-boundary=2)