| commit | 6582b7f7743da6ce3e3714e9e8b18e0e073d4acd | [log] [tgz] |
|---|---|---|
| author | Al Viro <viro@ftp.linux.org.uk> | Thu Aug 18 20:03:19 2011 +0100 |
| committer | Richard Weinberger <richard@nod.at> | Wed Nov 02 14:14:51 2011 +0100 |
| tree | 649346d2333865ccd4bb4d560ceb50c39139c5c2 | |
| parent | 858ba94499b4f48e9eb0be7cf0092f1ea9460fef [diff] [blame] |
um: merge arch/um/sys-{i386,x86_64}
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
diff --git a/arch/um/Makefile-i386 b/arch/um/Makefile-i386 index 302cbe5..7e5f1ba 100644 --- a/arch/um/Makefile-i386 +++ b/arch/um/Makefile-i386
@@ -1,4 +1,4 @@ -core-y += arch/um/sys-i386/ arch/x86/crypto/ +core-y += arch/um/sys-x86/ arch/x86/crypto/ TOP_ADDR := $(CONFIG_TOP_ADDR)