From 7a78a1722380dd3cb5a009dbcd007f92b6b87743 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Mon, 29 Oct 2007 04:34:31 +0000 Subject: more x86 merge fallout (uml, again) arch/i386/{Kconfig,Makefile}.cpu got moved Signed-off-by: Al Viro Signed-off-by: Linus Torvalds --- arch/um/Makefile-i386 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/um/Makefile-i386') diff --git a/arch/um/Makefile-i386 b/arch/um/Makefile-i386 index 08433f85189c..b01dfb00e5f8 100644 --- a/arch/um/Makefile-i386 +++ b/arch/um/Makefile-i386 @@ -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) -- cgit v1.2.1