| commit | 7a78a1722380dd3cb5a009dbcd007f92b6b87743 | [log] [tgz] |
|---|---|---|
| author | Al Viro <viro@ftp.linux.org.uk> | Mon Oct 29 04:34:31 2007 +0000 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon Oct 29 07:41:32 2007 -0700 |
| tree | 87d1f54d566ddd0428f92095572d72a680faa989 | |
| parent | ca5cd877ae699e758e6f26efc11b01bf6631d427 [diff] [blame] |
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>
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