m68k: merge the mmu and non-mmu versions of page_offset.h
authorGreg Ungerer <gerg@uclinux.org>
Mon, 2 Feb 2009 06:27:52 +0000 (16:27 +1000)
committerGreg Ungerer <gerg@uclinux.org>
Tue, 24 Mar 2009 05:17:43 +0000 (15:17 +1000)
commitac55cdfb02133df64d4aa5571b343d4e98673b07
tree3c7d1e4ba0fe5eda79f9adfe8e07f26dacb899f6
parente77d15511fc4e1554c500524dd43b9c162a2d95e
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>
arch/m68k/include/asm/page_offset.h
arch/m68k/include/asm/page_offset_mm.h [deleted file]
arch/m68k/include/asm/page_offset_no.h [deleted file]