OSDN Git Service

m68k: let Makefile sort out compiling mmu and non-mmu lib/checksum.c
authorGreg Ungerer <gerg@uclinux.org>
Mon, 18 Apr 2011 05:27:55 +0000 (15:27 +1000)
committerGreg Ungerer <gerg@uclinux.org>
Tue, 24 May 2011 00:03:50 +0000 (10:03 +1000)
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>
arch/m68k/lib/Makefile
arch/m68k/lib/checksum.c [deleted file]

index 2438d02..df421e5 100644 (file)
@@ -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 (file)
index 1297536..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef CONFIG_MMU
-#include "checksum_mm.c"
-#else
-#include "checksum_no.c"
-#endif