diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2011-03-28 16:48:00 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2011-05-24 10:03:49 +1000 |
| commit | d10ed2f5383cc6e6b7649f03540b8cb1838d5f67 (patch) | |
| tree | b2ee2537f23e452df1d98a88877ae28f7e3264fa /arch/m68k/lib/Makefile | |
| parent | 80160de89d0a7c9a93dfe91eef2b448cbc380cd0 (diff) | |
| download | blackbird-op-linux-d10ed2f5383cc6e6b7649f03540b8cb1838d5f67.tar.gz blackbird-op-linux-d10ed2f5383cc6e6b7649f03540b8cb1838d5f67.zip | |
m68k: remove duplicate memset() implementation
Merging the mmu and non-mmu directories we ended up with duplicate
implementations of memset(). One is a little more optimized for the
>= 68020 case, but that can easily be inserted into a single
implementation of memset(). 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, 3 insertions, 2 deletions
diff --git a/arch/m68k/lib/Makefile b/arch/m68k/lib/Makefile index ec479a9b9d7b..ac275d5e9e3c 100644 --- a/arch/m68k/lib/Makefile +++ b/arch/m68k/lib/Makefile @@ -3,12 +3,13 @@ # Makefile for m68k-specific library files.. # -lib-y := ashldi3.o ashrdi3.o lshrdi3.o muldi3.o memmove.o checksum.o +lib-y := ashldi3.o ashrdi3.o lshrdi3.o muldi3.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 memset.o delay.o + memcpy.o delay.o endif |
