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

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

diff -u --recursive --new-file v2.4.0-test4/linux/drivers/video/g364fb.c linux/drivers/video/g364fb.c
@@ -103,8 +103,6 @@
 			   struct fb_info *info);
 static int g364fb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 			   struct fb_info *info);
-static int g364fb_ioctl(struct inode *inode, struct file *file, u_int cmd,
-			u_long arg, int con, struct fb_info *info);
 
 
 /*
@@ -134,7 +132,6 @@
 	fb_get_cmap:	g364fb_get_cmap,
 	fb_set_cmap:	g364fb_set_cmap,
 	fb_pan_display:	g364fb_pan_display,
-	fb_ioctl:	g364fb_ioctl,
 };
 
 
@@ -155,9 +152,15 @@
 
 
 static struct display_switch fbcon_g364cfb8 = {
-    fbcon_cfb8_setup, fbcon_cfb8_bmove, fbcon_cfb8_clear, fbcon_cfb8_putc,
-    fbcon_cfb8_putcs, fbcon_cfb8_revc, fbcon_g364fb_cursor, NULL,
-    fbcon_cfb8_clear_margins, FONTWIDTH(8)
+    setup:		fbcon_cfb8_setup,
+    bmove:		fbcon_cfb8_bmove,
+    clear:		fbcon_cfb8_clear,
+    putc:		fbcon_cfb8_putc,
+    putcs:		fbcon_cfb8_putcs,
+    revc:		fbcon_cfb8_revc,
+    cursor:		fbcon_g364fb_cursor,
+    clear_margins:	fbcon_cfb8_clear_margins,
+    fontwidthmask:	FONTWIDTH(8)
 };
 
 /*
@@ -268,13 +271,6 @@
     } else
 	fb_copy_cmap(cmap, &fb_display[con].cmap, kspc ? 0 : 1);
     return 0;
-}
-
-
-static int g364fb_ioctl(struct inode *inode, struct file *file, u_int cmd,
-			u_long arg, int con, struct fb_info *info)
-{
-    return -EINVAL;
 }