Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7a78a1722380dd3cb5a009dbcd007f92b6b87743 Commit: 7a78a1722380dd3cb5a009dbcd007f92b6b87743 Parent: ca5cd877ae699e758e6f26efc11b01bf6631d427 Author: Al Viro <[EMAIL PROTECTED]> AuthorDate: Mon Oct 29 04:34:31 2007 +0000 Committer: Linus Torvalds <[EMAIL PROTECTED]> CommitDate: Mon Oct 29 07:41:32 2007 -0700
more x86 merge fallout (uml, again) arch/i386/{Kconfig,Makefile}.cpu got moved Signed-off-by: Al Viro <[EMAIL PROTECTED]> Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]> --- arch/um/Kconfig.i386 | 2 +- arch/um/Makefile-i386 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/um/Kconfig.i386 b/arch/um/Kconfig.i386 index 9876d80..e0ac74e 100644 --- a/arch/um/Kconfig.i386 +++ b/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/arch/um/Makefile-i386 b/arch/um/Makefile-i386 index 08433f8..b01dfb0 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) - 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