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/creatorfb.c | |
| parent | f7ff3f5a67747c7714c3db772d05965a0c033705 (diff) | |
Merge with Linux 2.4.0-test5-pre5.
Diffstat (limited to 'drivers/video/creatorfb.c')
| -rw-r--r-- | drivers/video/creatorfb.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/video/creatorfb.c b/drivers/video/creatorfb.c index d01a4c9fc..5ee5295c1 100644 --- a/drivers/video/creatorfb.c +++ b/drivers/video/creatorfb.c @@ -626,8 +626,13 @@ out: } static struct display_switch ffb_dispsw __initdata = { - ffb_setup, fbcon_redraw_bmove, ffb_clear, ffb_putc, ffb_putcs, ffb_revc, - NULL, NULL, NULL, FONTWIDTHRANGE(1,16) /* Allow fontwidths up to 16 */ + setup: ffb_setup, + bmove: fbcon_redraw_bmove, + clear: ffb_clear, + putc: ffb_putc, + putcs: ffb_putcs, + revc: ffb_revc, + fontwidthmask: FONTWIDTHRANGE(1,16) /* Allow fontwidths up to 16 */ }; static void ffb_margins (struct fb_info_sbusfb *fb, struct display *p, int x_margin, int y_margin) |