m68k: merge the mmu and non-mmu versions of fb.h
authorGreg Ungerer <gerg@uclinux.org>
Fri, 6 Feb 2009 04:25:53 +0000 (14:25 +1000)
committerGreg Ungerer <gerg@uclinux.org>
Tue, 24 Mar 2009 05:17:44 +0000 (15:17 +1000)
commit146b7cdba2c7afb14d965a5dc466a6532084042a
tree58f12234a5c563607d2bee06d9dd52d68bb078fe
parent4892242a47fe21724ee6a98d71d9c512716ea89d
m68k: merge the mmu and non-mmu versions of fb.h

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

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