From 90237ca635c5b842315f20b5348c5daff33197d7 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Tue, 15 Nov 2011 14:12:01 +1000
Subject: [PATCH] --- yaml --- r: 279732 b: refs/heads/master c:
 bfe4375a1a184c2145ef235e782660400b005882 h: refs/heads/master v: v3

---
 [refs]                                    |  2 +-
 trunk/arch/m68k/include/asm/page_offset.h | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 1aab4c157892..c627e3395760 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b852de4e7f7d6f4373901e3a880f6f29a65e7937
+refs/heads/master: bfe4375a1a184c2145ef235e782660400b005882
diff --git a/trunk/arch/m68k/include/asm/page_offset.h b/trunk/arch/m68k/include/asm/page_offset.h
index 1780152d81da..82626a8f1d0a 100644
--- a/trunk/arch/m68k/include/asm/page_offset.h
+++ b/trunk/arch/m68k/include/asm/page_offset.h
@@ -1,11 +1,9 @@
 /* This handles the memory map.. */
 
-#ifdef CONFIG_MMU
-#ifndef CONFIG_SUN3
-#define PAGE_OFFSET_RAW		0x00000000
-#else
+#if defined(CONFIG_RAMBASE)
+#define PAGE_OFFSET_RAW		CONFIG_RAMBASE
+#elif defined(CONFIG_SUN3)
 #define PAGE_OFFSET_RAW		0x0E000000
-#endif
 #else
-#define	PAGE_OFFSET_RAW		CONFIG_RAMBASE
+#define PAGE_OFFSET_RAW		0x00000000
 #endif