diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-10-27 12:03:58 +0400 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-10-28 06:54:35 +0400 |
commit | 299f6ce491aa28515d86f29af2779cbfdc7a4790 (patch) | |
tree | eb748a66cdff8b59d28f40266af9049d3425651a /arch/powerpc/lib | |
parent | a4a264f144d5389a52d467a7e41bec2834cfde75 (diff) | |
download | linux-299f6ce491aa28515d86f29af2779cbfdc7a4790.tar.xz |
ppc64: use mem_64.S from powerpc/lib
and remove the same bits from ppc64/lib/string.S.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'arch/powerpc/lib')
-rw-r--r-- | arch/powerpc/lib/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index 15b6b2696500..0115bf96751c 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile @@ -4,13 +4,12 @@ ifeq ($(CONFIG_PPC_MERGE),y) obj-y := string.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 usercopy_64.o + memcpy_64.o usercopy_64.o mem_64.o obj-$(CONFIG_PPC_ISERIES) += e2a.o ifeq ($(CONFIG_PPC64),y) obj-$(CONFIG_SMP) += locks.o |