From 89eba5eb77bbf92ffed6686c951cc35f4027e71f Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Thu, 27 Jul 2000 23:20:03 +0000 Subject: Merge with Linux 2.4.0-test5-pre5. --- drivers/video/cgsixfb.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'drivers/video/cgsixfb.c') 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) -- cgit v1.2.3