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

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

diff -u --recursive --new-file v2.4.0-test4/linux/drivers/video/cyberfb.c linux/drivers/video/cyberfb.c
@@ -251,10 +251,6 @@
 			    struct fb_info *info);
 static int cyberfb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 			    struct fb_info *info);
-static int cyberfb_pan_display(struct fb_var_screeninfo *var, int con,
-			       struct fb_info *info);
-static int cyberfb_ioctl(struct inode *inode, struct file *file, u_int cmd,
-			 u_long arg, int con, struct fb_info *info);
 
 /*
  *    Interface to the low level console driver
@@ -1007,30 +1003,6 @@
 }
 
 
-/*
- *    Pan or Wrap the Display
- *
- *    This call looks only at xoffset, yoffset and the FB_VMODE_YWRAP flag
- */
-
-static int cyberfb_pan_display(struct fb_var_screeninfo *var, int con,
-			       struct fb_info *info)
-{
-	return -EINVAL;
-}
-
-
-/*
-    *	 Cybervision Frame Buffer Specific ioctls
-    */
-
-static int cyberfb_ioctl(struct inode *inode, struct file *file,
-			 u_int cmd, u_long arg, int con, struct fb_info *info)
-{
-	return -EINVAL;
-}
-
-
 static struct fb_ops cyberfb_ops = {
 	owner:		THIS_MODULE,
 	fb_get_fix:	cyberfb_get_fix,
@@ -1038,8 +1010,6 @@
 	fb_set_var:	cyberfb_set_var,
 	fb_get_cmap:	cyberfb_get_cmap,
 	fb_set_cmap:	cyberfb_set_cmap,
-	fb_pan_display:	cyberfb_pan_display,
-	fb_ioctl:	cyberfb_ioctl,
 };
 
 int __init cyberfb_setup(char *options)
@@ -1270,9 +1240,14 @@
 }
 
 static struct display_switch fbcon_cyber8 = {
-   fbcon_cfb8_setup, fbcon_cyber8_bmove, fbcon_cyber8_clear, fbcon_cyber8_putc,
-   fbcon_cyber8_putcs, fbcon_cyber8_revc, NULL, NULL, fbcon_cfb8_clear_margins,
-   FONTWIDTH(8)
+	setup:		fbcon_cfb8_setup,
+	bmove:		fbcon_cyber8_bmove,
+	clear:		fbcon_cyber8_clear,
+	putc:		fbcon_cyber8_putc,
+	putcs:		fbcon_cyber8_putcs,
+	revc:		fbcon_cyber8_revc,
+	clear_margins:	fbcon_cfb8_clear_margins,
+	fontwidthmask:	FONTWIDTH(8)
 };
 #endif