From 4da5d68d09e3b4bcc97c339a604c7ea825bde090 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Mon, 2 Feb 2009 16:27:52 +1000
Subject: [PATCH] --- yaml --- r: 139967 b: refs/heads/master c:
 ac55cdfb02133df64d4aa5571b343d4e98673b07 h: refs/heads/master i:   139965:
 ac04f28a76af6ad61f848eff872e5699d7aefc21   139963:
 c0738806b8977b01ebb858825a9a1f85a216d386   139959:
 a1cd24f1d07403402937d8966bffb72810957300   139951:
 974d7e3b3e68eec461dda84353701afba8e854a3   139935:
 332886f75720cbd289a5ef261b926a9d217b67d1   139903:
 2158388d97d97bd4ba0c0b4df997ffccfff11c1c v: v3

---
 [refs]                                       |  2 +-
 trunk/arch/m68k/include/asm/page_offset.h    | 12 +++++++++---
 trunk/arch/m68k/include/asm/page_offset_mm.h |  8 --------
 trunk/arch/m68k/include/asm/page_offset_no.h |  5 -----
 4 files changed, 10 insertions(+), 17 deletions(-)
 delete mode 100644 trunk/arch/m68k/include/asm/page_offset_mm.h
 delete mode 100644 trunk/arch/m68k/include/asm/page_offset_no.h

diff --git a/[refs] b/[refs]
index 5764b198c2cb..1997da56b35e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e77d15511fc4e1554c500524dd43b9c162a2d95e
+refs/heads/master: ac55cdfb02133df64d4aa5571b343d4e98673b07
diff --git a/trunk/arch/m68k/include/asm/page_offset.h b/trunk/arch/m68k/include/asm/page_offset.h
index 66455c849fbb..1780152d81da 100644
--- a/trunk/arch/m68k/include/asm/page_offset.h
+++ b/trunk/arch/m68k/include/asm/page_offset.h
@@ -1,5 +1,11 @@
-#ifdef __uClinux__
-#include "page_offset_no.h"
+/* This handles the memory map.. */
+
+#ifdef CONFIG_MMU
+#ifndef CONFIG_SUN3
+#define PAGE_OFFSET_RAW		0x00000000
 #else
-#include "page_offset_mm.h"
+#define PAGE_OFFSET_RAW		0x0E000000
+#endif
+#else
+#define	PAGE_OFFSET_RAW		CONFIG_RAMBASE
 #endif
diff --git a/trunk/arch/m68k/include/asm/page_offset_mm.h b/trunk/arch/m68k/include/asm/page_offset_mm.h
deleted file mode 100644
index 1cbdb7f30ac2..000000000000
--- a/trunk/arch/m68k/include/asm/page_offset_mm.h
+++ /dev/null
@@ -1,8 +0,0 @@
-
-/* This handles the memory map.. */
-#ifndef CONFIG_SUN3
-#define PAGE_OFFSET_RAW		0x00000000
-#else
-#define PAGE_OFFSET_RAW		0x0E000000
-#endif
-
diff --git a/trunk/arch/m68k/include/asm/page_offset_no.h b/trunk/arch/m68k/include/asm/page_offset_no.h
deleted file mode 100644
index d4e73e0ba646..000000000000
--- a/trunk/arch/m68k/include/asm/page_offset_no.h
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-/* This handles the memory map.. */
-#define	PAGE_OFFSET_RAW		CONFIG_RAMBASE
-