From 8f4dfd2891d379dadaba348920ad51f56ebc363a Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Mon, 28 Mar 2011 15:58:49 +1000
Subject: [PATCH] --- yaml --- r: 250395 b: refs/heads/master c:
 b82ed87e67b081e55608b86b3e6f6f9036cedbd3 h: refs/heads/master i:   250393:
 7cf6e6f44d200b33b1faa9a16a0b651095a376eb   250391:
 1555e675b191919bbfd6eab89dfbfbfba076c541 v: v3

---
 [refs]                          |  2 +-
 trunk/arch/m68k/lib/Makefile    | 13 +++++++++++--
 trunk/arch/m68k/lib/Makefile_mm |  6 ------
 trunk/arch/m68k/lib/Makefile_no |  7 -------
 4 files changed, 12 insertions(+), 16 deletions(-)
 delete mode 100644 trunk/arch/m68k/lib/Makefile_mm
 delete mode 100644 trunk/arch/m68k/lib/Makefile_no

diff --git a/[refs] b/[refs]
index 009868594c77..857e29299fcc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98d655a68f864588ff21ae372ddd3563a6699f1c
+refs/heads/master: b82ed87e67b081e55608b86b3e6f6f9036cedbd3
diff --git a/trunk/arch/m68k/lib/Makefile b/trunk/arch/m68k/lib/Makefile
index 1f95881d8437..3d85fb6e6d3b 100644
--- a/trunk/arch/m68k/lib/Makefile
+++ b/trunk/arch/m68k/lib/Makefile
@@ -1,5 +1,14 @@
+
+#
+# Makefile for m68k-specific library files..
+#
+
+lib-y	:= ashldi3.o ashrdi3.o lshrdi3.o muldi3.o checksum.o
+
 ifdef CONFIG_MMU
-include arch/m68k/lib/Makefile_mm
+lib-y	+= string.o uaccess.o
 else
-include arch/m68k/lib/Makefile_no
+lib-y	+= mulsi3.o divsi3.o udivsi3.o modsi3.o umodsi3.o \
+	   memcpy.o memmove.o memset.o delay.o
 endif
+
diff --git a/trunk/arch/m68k/lib/Makefile_mm b/trunk/arch/m68k/lib/Makefile_mm
deleted file mode 100644
index af9abf8d9d98..000000000000
--- a/trunk/arch/m68k/lib/Makefile_mm
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Makefile for m68k-specific library files..
-#
-
-lib-y	:= ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \
-	   checksum.o string.o uaccess.o
diff --git a/trunk/arch/m68k/lib/Makefile_no b/trunk/arch/m68k/lib/Makefile_no
deleted file mode 100644
index 32d852e586d7..000000000000
--- a/trunk/arch/m68k/lib/Makefile_no
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Makefile for m68knommu specific library files..
-#
-
-lib-y	:= ashldi3.o ashrdi3.o lshrdi3.o \
-	   muldi3.o mulsi3.o divsi3.o udivsi3.o modsi3.o umodsi3.o \
-	   checksum.o memcpy.o memmove.o memset.o delay.o