patch-2.4.0-test5 linux/drivers/video/S3triofb.c

• Lines: 47
• Date: Wed Jul 26 11:08:40 2000
• Orig file: v2.4.0-test4/linux/drivers/video/S3triofb.c
• Orig date: Fri Jun 23 21:55:10 2000

diff -u --recursive --new-file v2.4.0-test4/linux/drivers/video/S3triofb.c linux/drivers/video/S3triofb.c
@@ -89,8 +89,6 @@
 			   struct fb_info *info);
 static int s3trio_pan_display(struct fb_var_screeninfo *var, int con,
 			      struct fb_info *info);
-static int s3trio_ioctl(struct inode *inode, struct file *file, u_int cmd,
-			u_long arg, int con, struct fb_info *info);
 
 
     /*
@@ -146,7 +144,6 @@
 	fb_get_cmap:	s3trio_get_cmap,
 	fb_set_cmap:	s3trio_set_cmap,
 	fb_pan_display:	s3trio_pan_display,
-	fb_ioctl:	s3trio_ioctl,
 };
 
     /*
@@ -264,12 +261,6 @@
 }
 
 
-static int s3trio_ioctl(struct inode *inode, struct file *file, u_int cmd,
-			u_long arg, int con, struct fb_info *info)
-{
-    return -EINVAL;
-}
-
 int __init s3triofb_init(void)
 {
 #ifdef __powerpc__
@@ -861,8 +852,13 @@
 }
 
 static struct display_switch fbcon_trio8 = {
-   fbcon_cfb8_setup, fbcon_trio8_bmove, fbcon_trio8_clear, fbcon_trio8_putc,
-   fbcon_trio8_putcs, fbcon_trio8_revc, NULL, NULL, fbcon_cfb8_clear_margins,
-   FONTWIDTH(8)
+   setup:		fbcon_cfb8_setup,
+   bmove:		fbcon_trio8_bmove,
+   clear:		fbcon_trio8_clear,
+   putc:		fbcon_trio8_putc,
+   putcs:		fbcon_trio8_putcs,
+   revc:		fbcon_trio8_revc,
+   clear_margins:	fbcon_cfb8_clear_margins,
+   fontwidthmask:	FONTWIDTH(8)
 };
 #endif