---

yaml --- r: 139967 b: refs/heads/master c: ac55cdf h: refs/heads/master i: 139965: ac04f28 139963: c073880 139959: a1cd24f 139951: 974d7e3 139935: 332886f 139903: 2158388 v: v3
git-mirror · Mar 24, 2009 · 4da5d68 · 4da5d68
1 parent 5c8b119
commit 4da5d68
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 17 deletions.
diff --git 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
@@ -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
diff --git a/trunk/arch/m68k/include/asm/page_offset_no.h b/trunk/arch/m68k/include/asm/page_offset_no.h