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

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

diff -u --recursive --new-file v2.4.0-test4/linux/drivers/video/chipsfb.c linux/drivers/video/chipsfb.c
@@ -121,14 +121,10 @@
 			 struct fb_info *info);
 static int chips_set_var(struct fb_var_screeninfo *var, int con,
 			 struct fb_info *info);
-static int chips_pan_display(struct fb_var_screeninfo *var, int con,
-			     struct fb_info *info);
 static int chips_get_cmap(struct fb_cmap *cmap, int kspc, int con,
 			  struct fb_info *info);
 static int chips_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 			  struct fb_info *info);
-static int chips_ioctl(struct inode *inode, struct file *file, u_int cmd,
-		       u_long arg, int con, struct fb_info *info);
 
 static struct fb_ops chipsfb_ops = {
 	owner:		THIS_MODULE,
@@ -137,8 +133,6 @@
 	fb_set_var:	chips_set_var,
 	fb_get_cmap:	chips_get_cmap,
 	fb_set_cmap:	chips_set_cmap,
-	fb_pan_display:	chips_pan_display,
-	fb_ioctl:	chips_ioctl,
 };
 
 static int chipsfb_getcolreg(u_int regno, u_int *red, u_int *green,
@@ -187,14 +181,6 @@
 	return 0;
 }
 
-static int chips_pan_display(struct fb_var_screeninfo *var, int con,
-			     struct fb_info *info)
-{
-	if (var->xoffset != 0 || var->yoffset != 0)
-		return -EINVAL;
-	return 0;
-}
-
 static int chips_get_cmap(struct fb_cmap *cmap, int kspc, int con,
 			  struct fb_info *info)
 {
@@ -224,12 +210,6 @@
 	else
 		fb_copy_cmap(cmap, &fb_display[con].cmap, kspc ? 0 : 1);
 	return 0;
-}
-
-static int chips_ioctl(struct inode *inode, struct file *file, u_int cmd,
-		       u_long arg, int con, struct fb_info *info)
-{
-	return -EINVAL;
 }
 
 static int chipsfbcon_switch(int con, struct fb_info *info)