m68k: merge the mmu and non-mmu versions of mmu.h
authorGreg Ungerer <gerg@uclinux.org>
Thu, 29 Jan 2009 05:57:30 +0000 (15:57 +1000)
committerGreg Ungerer <gerg@uclinux.org>
Tue, 24 Mar 2009 05:17:42 +0000 (15:17 +1000)
commit54cae79e52d6a72faa3d6993dcaba560bfac8db3
treed8661c4f581048d6dd7cc7b00d2ce7a7a08ddf4b
parentbf7058f04ab74061b75a166e30ae0a7e617f0430
m68k: merge the mmu and non-mmu versions of mmu.h

Trivial merge of the contents of mmu and non-mmu versions of mmu.h

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