diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2011-08-18 19:03:19 (GMT) |
---|---|---|
committer | Richard Weinberger <richard@nod.at> | 2011-11-02 13:14:51 (GMT) |
commit | 6582b7f7743da6ce3e3714e9e8b18e0e073d4acd (patch) | |
tree | 649346d2333865ccd4bb4d560ceb50c39139c5c2 /arch/um/Makefile-x86_64 | |
parent | 858ba94499b4f48e9eb0be7cf0092f1ea9460fef (diff) | |
download | linux-6582b7f7743da6ce3e3714e9e8b18e0e073d4acd.tar.xz |
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>
Diffstat (limited to 'arch/um/Makefile-x86_64')
-rw-r--r-- | arch/um/Makefile-x86_64 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/Makefile-x86_64 b/arch/um/Makefile-x86_64 index a9cd7e7..92d8f8f 100644 --- a/arch/um/Makefile-x86_64 +++ b/arch/um/Makefile-x86_64 @@ -1,7 +1,7 @@ # Copyright 2003 - 2004 Pathscale, Inc # Released under the GPL -core-y += arch/um/sys-x86_64/ arch/x86/crypto/ +core-y += arch/um/sys-x86/ arch/x86/crypto/ START := 0x60000000 _extra_flags_ = -fno-builtin -m64 |