| commit | 146b7cdba2c7afb14d965a5dc466a6532084042a | |
| author | Greg Ungerer <gerg@uclinux.org> | |
| Fri, 6 Feb 2009 04:25:53 +0000 (6 14:25 +1000) | ||
| committer | Greg Ungerer <gerg@uclinux.org> | |
| Tue, 24 Mar 2009 05:17:44 +0000 (24 15:17 +1000) | ||
| tree | 58f12234a5c563607d2bee06d9dd52d68bb078fe | treesnapshot (tar.gz zip) |
| parent | 4892242a47fe21724ee6a98d71d9c512716ea89d | commitdiff |
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>
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 | [moved from arch/m68k/include/asm/fb_mm.h with 89% similarity] | diffblobblamehistory |
| arch/m68k/include/asm/fb_no.h | [deleted file] | blobblamehistory |