diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-10-27 16:49:44 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-10-28 12:53:58 +1000 |
commit | 12a39407f021fd17d5f9d33d78bddb005bd106fb (patch) | |
tree | 51e7848336623b11409f4106a0fb83f29644ec76 /arch/powerpc/lib | |
parent | ecc81e0f719f566b75b222b8aef64c8b809b2e29 (diff) | |
download | linux-3.10-12a39407f021fd17d5f9d33d78bddb005bd106fb.tar.gz linux-3.10-12a39407f021fd17d5f9d33d78bddb005bd106fb.tar.bz2 linux-3.10-12a39407f021fd17d5f9d33d78bddb005bd106fb.zip |
ppc64: use memcpy_64.S from powerpc/lib
since it is identical to mempcy.S 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/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index 955c0642159..9cf35ed3f33 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile @@ -5,11 +5,11 @@ ifeq ($(CONFIG_PPC_MERGE),y) obj-y := strcase.o string.o obj-$(CONFIG_PPC32) += div64.o copy_32.o checksum_32.o -obj-$(CONFIG_PPC64) += memcpy_64.o \ - usercopy_64.o sstep.o mem_64.o +obj-$(CONFIG_PPC64) += usercopy_64.o sstep.o mem_64.o endif -obj-$(CONFIG_PPC64) += checksum_64.o copypage_64.o copyuser_64.o +obj-$(CONFIG_PPC64) += checksum_64.o copypage_64.o copyuser_64.o \ + memcpy_64.o obj-$(CONFIG_PPC_ISERIES) += e2a.o ifeq ($(CONFIG_PPC64),y) obj-$(CONFIG_SMP) += locks.o |