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

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

diff -u --recursive --new-file v2.4.0-test4/linux/drivers/video/retz3fb.c linux/drivers/video/retz3fb.c
@@ -277,11 +277,6 @@
 			    struct fb_info *info);
 static int retz3fb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 			    struct fb_info *info);
-static int retz3fb_pan_display(struct fb_var_screeninfo *var, int con,
-			       struct fb_info *info);
-static int retz3fb_ioctl(struct inode *inode, struct file *file,
-			 unsigned int cmd, unsigned long arg, int con,
-			 struct fb_info *info);
 
 
 /*
@@ -1338,31 +1333,6 @@
 }
 
 
-/*
- *    Pan or Wrap the Display
- *
- *    This call looks only at xoffset, yoffset and the FB_VMODE_YWRAP flag
- */
-
-static int retz3fb_pan_display(struct fb_var_screeninfo *var, int con,
-				struct fb_info *info)
-{
-	return -EINVAL;
-}
-
-
-/*
- *    RetinaZ3 Frame Buffer Specific ioctls
- */
-
-static int retz3fb_ioctl(struct inode *inode, struct file *file,
-                         unsigned int cmd, unsigned long arg, int con,
-                         struct fb_info *info)
-{
-	return -EINVAL;
-}
-
-
 static struct fb_ops retz3fb_ops = {
 	owner:		THIS_MODULE,
 	fb_get_fix:	retz3fb_get_fix,
@@ -1370,8 +1340,6 @@
 	fb_set_var:	retz3fb_set_var,
 	fb_get_cmap:	retz3fb_get_cmap,
 	fb_set_cmap:	retz3fb_set_cmap,
-	fb_pan_display:	retz3fb_pan_display,
-	fb_ioctl:	retz3fb_ioctl,
 };
 
 
@@ -1669,8 +1637,13 @@
 
 
 static struct display_switch fbcon_retz3_8 = {
-    fbcon_cfb8_setup, retz3_8_bmove, retz3_8_clear,
-    retz3_putc, retz3_putcs, retz3_revc, NULL, NULL,
-    retz3_clear_margins, FONTWIDTH(8)
+    setup:		fbcon_cfb8_setup,
+    bmove:		retz3_8_bmove,
+    clear:		retz3_8_clear,
+    putc:		retz3_putc,
+    putcs:		retz3_putcs,
+    revc:		retz3_revc,
+    clear_margins:	retz3_clear_margins,
+    fontwidthmask:	FONTWIDTH(8)
 };
 #endif