tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Greg Ungerer ac55cdfb e77d1551

+9 -16
+9 -3
arch/m68k/include/asm/page_offset.h
··· 1 - #ifdef __uClinux__ 2 - #include "page_offset_no.h" 1 + /* This handles the memory map.. */ 2 + 3 + #ifdef CONFIG_MMU 4 + #ifndef CONFIG_SUN3 5 + #define PAGE_OFFSET_RAW 0x00000000 3 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 11 #endif
-8
arch/m68k/include/asm/page_offset_mm.h
··· 1 - 2 - /* This handles the memory map.. */ 3 - #ifndef CONFIG_SUN3 4 - #define PAGE_OFFSET_RAW 0x00000000 5 - #else 6 - #define PAGE_OFFSET_RAW 0x0E000000 7 - #endif 8 -
-5
arch/m68k/include/asm/page_offset_no.h
··· 1 - 2 - 3 - /* This handles the memory map.. */ 4 - #define PAGE_OFFSET_RAW CONFIG_RAMBASE 5 -