From c1d8f83a6996e50f2693198ba321e50b41ed64bf Mon Sep 17 00:00:00 2001 From: Al Viro Date: Mon, 29 Oct 2007 04:34:31 +0000 Subject: [PATCH] --- yaml --- r: 72679 b: refs/heads/master c: 7a78a1722380dd3cb5a009dbcd007f92b6b87743 h: refs/heads/master i: 72677: 1b6b799dd49718c7e0b62a123a293f6ef6db9e50 72675: 157a0765b1b2406ae23993829a58d9a38ad01524 72671: ae5f38360aac8e435bd4e324bb548f3a37367326 v: v3 --- [refs] | 2 +- trunk/arch/um/Kconfig.i386 | 2 +- trunk/arch/um/Makefile-i386 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 15f2e77393a8..f48c19ae365d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ca5cd877ae699e758e6f26efc11b01bf6631d427 +refs/heads/master: 7a78a1722380dd3cb5a009dbcd007f92b6b87743 diff --git a/trunk/arch/um/Kconfig.i386 b/trunk/arch/um/Kconfig.i386 index 9876d80d85dd..e0ac74e5d4c4 100644 --- a/trunk/arch/um/Kconfig.i386 +++ b/trunk/arch/um/Kconfig.i386 @@ -1,6 +1,6 @@ menu "Host processor type and features" -source "arch/i386/Kconfig.cpu" +source "arch/x86/Kconfig.cpu" endmenu diff --git a/trunk/arch/um/Makefile-i386 b/trunk/arch/um/Makefile-i386 index 08433f85189c..b01dfb00e5f8 100644 --- a/trunk/arch/um/Makefile-i386 +++ b/trunk/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)