m68k: merge the mmu and non-mmu versions of segment.h
authorGreg Ungerer <gerg@uclinux.org>
Fri, 6 Feb 2009 04:14:29 +0000 (14:14 +1000)
committerGreg Ungerer <gerg@uclinux.org>
Tue, 24 Mar 2009 05:17:44 +0000 (15:17 +1000)
commit4892242a47fe21724ee6a98d71d9c512716ea89d
treee18ec0dfffbf1c0a70aa0553911190b732b27ee0
parent872065e78c0dff5a384128ea198b34f72e9d5c3a
m68k: merge the mmu and non-mmu versions of segment.h

Trivial merge of the mmu and non-mmu version of segment.h.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
arch/m68k/include/asm/segment.h
arch/m68k/include/asm/segment_mm.h [deleted file]
arch/m68k/include/asm/segment_no.h [deleted file]