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

• Lines: 50
• Date: Wed Jul 26 11:08:41 2000
• Orig file: v2.4.0-test4/linux/drivers/video/sisfb.c
• Orig date: Mon Jul 10 16:47:25 2000

diff -u --recursive --new-file v2.4.0-test4/linux/drivers/video/sisfb.c linux/drivers/video/sisfb.c
@@ -186,10 +186,10 @@
 unsigned long rom_vbase;
 
 /* mode */
-int video_type = FB_TYPE_PACKED_PIXELS;
-int video_linelength;
-int video_cmap_len;
-int sisfb_off = 0;
+static int video_type = FB_TYPE_PACKED_PIXELS;
+static int video_linelength;
+static int video_cmap_len;
+static int sisfb_off = 0;
 
 static struct fb_var_screeninfo default_var = {
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -434,8 +434,6 @@
 			  struct fb_info *info);
 static int sisfb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 			  struct fb_info *info);
-static int sisfb_pan_display(struct fb_var_screeninfo *var, int con,
-			     struct fb_info *info);
 static int sisfb_ioctl(struct inode *inode, struct file *file,
 		       unsigned int cmd, unsigned long arg, int con,
 		       struct fb_info *info);
@@ -2598,17 +2596,6 @@
 	return 0;
 }
 
-/*
- *    Pan or Wrap the Display
- */
-
-static int sisfb_pan_display(struct fb_var_screeninfo *var, int con,
-			     struct fb_info *info)
-{
-	/* not support virtual screen yet */
-	return -EINVAL;
-}
-
 static int sisfb_ioctl(struct inode *inode, struct file *file,
 		       unsigned int cmd, unsigned long arg, int con,
 		       struct fb_info *info)
@@ -2694,7 +2681,6 @@
 	fb_set_var:	sisfb_set_var,
 	fb_get_cmap:	sisfb_get_cmap,
 	fb_set_cmap:	sisfb_set_cmap,
-	fb_pan_display:	sisfb_pan_display,
 	fb_ioctl:	sisfb_ioctl,
 	fb_mmap:	sisfb_mmap,
 };