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/fbcon-mfb.c | |
parent | f7ff3f5a67747c7714c3db772d05965a0c033705 (diff) |
Merge with Linux 2.4.0-test5-pre5.
Diffstat (limited to 'drivers/video/fbcon-mfb.c')
-rw-r--r-- | drivers/video/fbcon-mfb.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/video/fbcon-mfb.c b/drivers/video/fbcon-mfb.c index 9aa3528dd..6185d8f3f 100644 --- a/drivers/video/fbcon-mfb.c +++ b/drivers/video/fbcon-mfb.c @@ -178,9 +178,14 @@ void fbcon_mfb_clear_margins(struct vc_data *conp, struct display *p, */ struct display_switch fbcon_mfb = { - fbcon_mfb_setup, fbcon_mfb_bmove, fbcon_mfb_clear, fbcon_mfb_putc, - fbcon_mfb_putcs, fbcon_mfb_revc, NULL, NULL, fbcon_mfb_clear_margins, - FONTWIDTH(8) + setup: fbcon_mfb_setup, + bmove: fbcon_mfb_bmove, + clear: fbcon_mfb_clear, + putc: fbcon_mfb_putc, + putcs: fbcon_mfb_putcs, + revc: fbcon_mfb_revc, + clear_margins: fbcon_mfb_clear_margins, + fontwidthmask: FONTWIDTH(8) }; |