diff options
author | Greg Ungerer <gerg@uclinux.org> | 2011-03-28 06:53:37 (GMT) |
---|---|---|
committer | Greg Ungerer <gerg@uclinux.org> | 2011-05-24 00:03:49 (GMT) |
commit | 66d83ab32aec5d84d707d4d72717b9468ec33a96 (patch) | |
tree | 09a7748e0980fd99b6925a92ad5af53c87638a53 /arch/m68k/lib/Makefile | |
parent | d10ed2f5383cc6e6b7649f03540b8cb1838d5f67 (diff) | |
download | linux-66d83ab32aec5d84d707d4d72717b9468ec33a96.tar.xz |
m68k: remove duplicate memcpy() implementation
Merging the mmu and non-mmu directories we ended up with duplicate
implementations of memcpy(). One is a little more optimized for the
>= 68020 case, but that can easily be inserted into a single
implementation of memcpy(). Clean up the exporting of this symbol
too, otherwise we end up exporting it twice on a no-mmu build.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/lib/Makefile')
-rw-r--r-- | arch/m68k/lib/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/m68k/lib/Makefile b/arch/m68k/lib/Makefile index ac275d5..2438d02 100644 --- a/arch/m68k/lib/Makefile +++ b/arch/m68k/lib/Makefile @@ -4,12 +4,11 @@ # lib-y := ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \ - memset.o memmove.o checksum.o + memcpy.o memset.o memmove.o checksum.o ifdef CONFIG_MMU lib-y += string.o uaccess.o else -lib-y += mulsi3.o divsi3.o udivsi3.o modsi3.o umodsi3.o \ - memcpy.o delay.o +lib-y += mulsi3.o divsi3.o udivsi3.o modsi3.o umodsi3.o delay.o endif |