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

• Lines: 45
• Date: Wed Jul 26 11:08:41 2000
• Orig file: v2.4.0-test4/linux/drivers/video/vesafb.c
• Orig date: Fri Jul 14 12:12:14 2000

diff -u --recursive --new-file v2.4.0-test4/linux/drivers/video/vesafb.c linux/drivers/video/vesafb.c
@@ -47,14 +47,14 @@
 char *video_vbase;        /* mapped */
 
 /* mode */
-int  video_bpp;
-int  video_width;
-int  video_height;
-int  video_height_virtual;
-int  video_type = FB_TYPE_PACKED_PIXELS;
-int  video_visual;
-int  video_linelength;
-int  video_cmap_len;
+static int  video_bpp;
+static int  video_width;
+static int  video_height;
+static int  video_height_virtual;
+static int  video_type = FB_TYPE_PACKED_PIXELS;
+static int  video_visual;
+static int  video_linelength;
+static int  video_cmap_len;
 
 /* --------------------------------------------------------------------- */
 
@@ -438,13 +438,6 @@
 	return 0;
 }
 
-static int vesafb_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 vesafb_ops = {
 	owner:		THIS_MODULE,
 	fb_get_fix:	vesafb_get_fix,
@@ -453,7 +446,6 @@
 	fb_get_cmap:	vesafb_get_cmap,
 	fb_set_cmap:	vesafb_set_cmap,
 	fb_pan_display:	vesafb_pan_display,
-	fb_ioctl:	vesafb_ioctl,
 };
 
 int vesafb_setup(char *options)