summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/lib
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-10-27 17:28:21 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2005-10-28 12:54:26 +1000
commita4a264f144d5389a52d467a7e41bec2834cfde75 (patch)
tree6366953476ea5d4ab7a53444260068e4141debf8 /arch/powerpc/lib
parenta2b0ca84a1198505f0b3c7b55b7769dd5dbd0791 (diff)
downloadlinux-a4a264f144d5389a52d467a7e41bec2834cfde75.tar.bz2
ppc64: use usercopy_64.c from powerpc/lib
since it is identical to usercopy.c from ppc64/lib. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'arch/powerpc/lib')
-rw-r--r--arch/powerpc/lib/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index 0726235ef25d..15b6b2696500 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -4,13 +4,13 @@
ifeq ($(CONFIG_PPC_MERGE),y)
obj-y := string.o
-obj-$(CONFIG_PPC64) += usercopy_64.o mem_64.o
+obj-$(CONFIG_PPC64) += mem_64.o
endif
obj-y += strcase.o
obj-$(CONFIG_PPC32) += div64.o copy_32.o checksum_32.o
obj-$(CONFIG_PPC64) += checksum_64.o copypage_64.o copyuser_64.o \
- memcpy_64.o
+ memcpy_64.o usercopy_64.o
obj-$(CONFIG_PPC_ISERIES) += e2a.o
ifeq ($(CONFIG_PPC64),y)
obj-$(CONFIG_SMP) += locks.o