From 68f4b7e41936a21ca50a61096e420a359fe5f932 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Mon, 18 Apr 2011 15:27:55 +1000
Subject: [PATCH] --- yaml --- r: 250399 b: refs/heads/master c:
 9461702d2a54cd4d9da09b7755c96815791a9d07 h: refs/heads/master i:   250397:
 dbfe06a8fb354e8116bc9f80f48fb49d3eed9a3c   250395:
 8f4dfd2891d379dadaba348920ad51f56ebc363a   250391:
 1555e675b191919bbfd6eab89dfbfbfba076c541   250383:
 25d82662dbe2a6574a5c22fbb440fea6860928fd   250367:
 e7aa42553260ac18cf40b878b4f512968961f5ac v: v3

---
 [refs]                         | 2 +-
 trunk/arch/m68k/lib/Makefile   | 6 +++---
 trunk/arch/m68k/lib/checksum.c | 5 -----
 3 files changed, 4 insertions(+), 9 deletions(-)
 delete mode 100644 trunk/arch/m68k/lib/checksum.c

diff --git a/[refs] b/[refs]
index 19838a413ac9..642e3e01ae07 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66d83ab32aec5d84d707d4d72717b9468ec33a96
+refs/heads/master: 9461702d2a54cd4d9da09b7755c96815791a9d07
diff --git a/trunk/arch/m68k/lib/Makefile b/trunk/arch/m68k/lib/Makefile
index 2438d02ebf43..df421e501436 100644
--- a/trunk/arch/m68k/lib/Makefile
+++ b/trunk/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/trunk/arch/m68k/lib/checksum.c b/trunk/arch/m68k/lib/checksum.c
deleted file mode 100644
index 1297536060de..000000000000
--- a/trunk/arch/m68k/lib/checksum.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef CONFIG_MMU
-#include "checksum_mm.c"
-#else
-#include "checksum_no.c"
-#endif