diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-27 23:20:03 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-27 23:20:03 +0000 |
| commit | 89eba5eb77bbf92ffed6686c951cc35f4027e71f (patch) | |
| tree | b56887b1753ca2573002bc7f60e5f3e47c33b116 /drivers/video/cgsixfb.c | |
| parent | f7ff3f5a67747c7714c3db772d05965a0c033705 (diff) | |
Merge with Linux 2.4.0-test5-pre5.
Diffstat (limited to 'drivers/video/cgsixfb.c')
| -rw-r--r-- | drivers/video/cgsixfb.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/video/cgsixfb.c b/drivers/video/cgsixfb.c index 2fd457eb6..1b4ae093a 100644 --- a/drivers/video/cgsixfb.c +++ b/drivers/video/cgsixfb.c @@ -517,8 +517,13 @@ static void cg6_restore_palette (struct fb_info_sbusfb *fb) } static struct display_switch cg6_dispsw __initdata = { - cg6_setup, fbcon_redraw_bmove, cg6_clear, cg6_putc, cg6_putcs, cg6_revc, - NULL, NULL, NULL, FONTWIDTHRANGE(1,16) /* Allow fontwidths up to 16 */ + setup: cg6_setup, + bmove: fbcon_redraw_bmove, + clear: cg6_clear, + putc: cg6_putc, + putcs: cg6_putcs, + revc: cg6_revc, + fontwidthmask: FONTWIDTHRANGE(1,16) /* Allow fontwidths up to 16 */ }; static void cg6_setcursormap (struct fb_info_sbusfb *fb, u8 *red, u8 *green, u8 *blue) |