m68k: merge the mmu and non-mmu versions of bugs.h
commit76adcb2e812464c38b42f18ab76e78e71df40464
authorGreg Ungerer <gerg@uclinux.org>
Fri, 6 Feb 2009 04:45:23 +0000 (6 14:45 +1000)
committerGreg Ungerer <gerg@uclinux.org>
Tue, 24 Mar 2009 05:17:45 +0000 (24 15:17 +1000)
treecf8bfa38dae54f52ad9216b18b2e6d39aeb121b8
parentdbc367eb69cedf47c702310e4abe1514d52abb4b
m68k: merge the mmu and non-mmu versions of bugs.h

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

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