patch-2.4.9 linux/drivers/video/fbcon-sti.c

Next file: linux/drivers/video/sa1100fb.c
Previous file: linux/drivers/video/cyberfb.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.8/linux/drivers/video/fbcon-sti.c linux/drivers/video/fbcon-sti.c
@@ -16,7 +16,7 @@
 #include <linux/console.h>
 #include <linux/string.h>
 #include <linux/fb.h>
-#include <asm/delay.h>
+#include <linux/delay.h>
 #include <asm/types.h>
 
 #include <video/fbcon.h>
@@ -323,8 +323,12 @@
      */
 
 struct display_switch fbcon_sti = {
-	fbcon_sti_setup, fbcon_sti_bmove, fbcon_sti_clear,
-	fbcon_sti_putc, fbcon_sti_putcs, fbcon_sti_revc,
-	NULL, NULL, fbcon_sti_clear_margins,
-	FONTWIDTH(8)
+	setup:		fbcon_sti_setup, 
+	bmove:		fbcon_sti_bmove, 
+	clear:		fbcon_sti_clear,
+	putc:		fbcon_sti_putc, 
+	putcs:		fbcon_sti_putcs, 
+	revc:		fbcon_sti_revc,
+	clear_margins:	fbcon_sti_clear_margins,
+	fontwidthmask:	FONTWIDTH(8)
 };

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)