diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2011-04-18 07:27:55 +0200 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2011-05-24 02:03:50 +0200 |
| commit | 9461702d2a54cd4d9da09b7755c96815791a9d07 (patch) | |
| tree | 86bf4b2cf8ce5a46bffc5a7b175203b61477d612 /arch/m68k/lib | |
| parent | m68k: remove duplicate memcpy() implementation (diff) | |
| download | linux-9461702d2a54cd4d9da09b7755c96815791a9d07.tar.xz linux-9461702d2a54cd4d9da09b7755c96815791a9d07.zip | |
m68k: let Makefile sort out compiling mmu and non-mmu lib/checksum.c
We don't need an arch/m68k/lib/checksum.c wrapper to include the correct
mmu or non-mmu version of the checksum code. Let the Makefile just build
the appropriate one.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k/lib')
| -rw-r--r-- | arch/m68k/lib/Makefile | 6 | ||||
| -rw-r--r-- | arch/m68k/lib/checksum.c | 5 |
2 files changed, 3 insertions, 8 deletions
diff --git a/arch/m68k/lib/Makefile b/arch/m68k/lib/Makefile index 2438d02ebf43..df421e501436 100644 --- a/arch/m68k/lib/Makefile +++ b/arch/m68k/lib/Makefile @@ -4,11 +4,11 @@ # lib-y := ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \ - memcpy.o memset.o memmove.o checksum.o + memcpy.o memset.o memmove.o ifdef CONFIG_MMU -lib-y += string.o uaccess.o +lib-y += string.o uaccess.o checksum_mm.o else -lib-y += mulsi3.o divsi3.o udivsi3.o modsi3.o umodsi3.o delay.o +lib-y += mulsi3.o divsi3.o udivsi3.o modsi3.o umodsi3.o delay.o checksum_no.o endif diff --git a/arch/m68k/lib/checksum.c b/arch/m68k/lib/checksum.c deleted file mode 100644 index 1297536060de..000000000000 --- a/arch/m68k/lib/checksum.c +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef CONFIG_MMU -#include "checksum_mm.c" -#else -#include "checksum_no.c" -#endif |