summaryrefslogtreecommitdiffstats
path: root/arch/um/Makefile-i386
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2011-08-18 20:03:19 +0100
committerRichard Weinberger <richard@nod.at>2011-11-02 14:14:51 +0100
commit6582b7f7743da6ce3e3714e9e8b18e0e073d4acd (patch)
tree649346d2333865ccd4bb4d560ceb50c39139c5c2 /arch/um/Makefile-i386
parent858ba94499b4f48e9eb0be7cf0092f1ea9460fef (diff)
downloadblackbird-op-linux-6582b7f7743da6ce3e3714e9e8b18e0e073d4acd.tar.gz
blackbird-op-linux-6582b7f7743da6ce3e3714e9e8b18e0e073d4acd.zip
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-i386')
-rw-r--r--arch/um/Makefile-i3862
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/Makefile-i386 b/arch/um/Makefile-i386
index 302cbe504543..7e5f1baf7c93 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)
OpenPOWER on IntegriCloud