Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac55cdfb authored by Greg Ungerer's avatar Greg Ungerer
Browse files

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: default avatarGreg Ungerer <gerg@uclinux.org>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent e77d1551

arch/m68k/include/asm/page_offset.h

+9 −3
Original line number Diff line number Diff line 
#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

arch/m68k/include/asm/page_offset_mm.h

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 


/* This handles the memory map.. */

#ifndef CONFIG_SUN3

#define PAGE_OFFSET_RAW		0x00000000

#else

#define PAGE_OFFSET_RAW		0x0E000000

#endif

arch/m68k/include/asm/page_offset_no.h

deleted100644 → 0
+0 −5
Original line number Diff line number Diff line 




/* This handles the memory map.. */

#define	PAGE_OFFSET_RAW		CONFIG_RAMBASE