aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/include/asm/page_offset.h
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2009-02-02 01:27:52 -0500
committerGreg Ungerer <gerg@uclinux.org>2009-03-24 01:17:43 -0400
commitac55cdfb02133df64d4aa5571b343d4e98673b07 (patch)
tree3c7d1e4ba0fe5eda79f9adfe8e07f26dacb899f6 /arch/m68k/include/asm/page_offset.h
parente77d15511fc4e1554c500524dd43b9c162a2d95e (diff)
m68k: merge the mmu and non-mmu versions of page_offset.h
Trivial merge of the mmu and non-mmu versions of page_offset.h Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/include/asm/page_offset.h')
-rw-r--r--arch/m68k/include/asm/page_offset.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/arch/m68k/include/asm/page_offset.h b/arch/m68k/include/asm/page_offset.h
index 66455c849fbb..1780152d81da 100644
--- a/arch/m68k/include/asm/page_offset.h
+++ b/arch/m68k/include/asm/page_offset.h
@@ -1,5 +1,11 @@
1#ifdef __uClinux__ 1/* This handles the memory map.. */
2#include "page_offset_no.h" 2
3#ifdef CONFIG_MMU
4#ifndef CONFIG_SUN3
5#define PAGE_OFFSET_RAW 0x00000000
3#else 6#else
4#include "page_offset_mm.h" 7#define PAGE_OFFSET_RAW 0x0E000000
8#endif
9#else
10#define PAGE_OFFSET_RAW CONFIG_RAMBASE
5#endif 11#endif