Merge with Linux 2.4.0-test5-pre6.

36 files changed, 7 insertions, 627 deletions

diff --git a/drivers/video/S3triofb.c b/drivers/video/S3triofb.c
index dacf0e317..333fd6576 100644
--- a/drivers/video/S3triofb.c
+++ b/drivers/video/S3triofb.c
@@ -89,8 +89,6 @@ static int s3trio_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 			   struct fb_info *info);
 static int s3trio_pan_display(struct fb_var_screeninfo *var, int con,
 			      struct fb_info *info);
-static int s3trio_ioctl(struct inode *inode, struct file *file, u_int cmd,
-			u_long arg, int con, struct fb_info *info);
 
 
     /*
@@ -146,7 +144,6 @@ static struct fb_ops s3trio_ops = {
 	fb_get_cmap:	s3trio_get_cmap,
 	fb_set_cmap:	s3trio_set_cmap,
 	fb_pan_display:	s3trio_pan_display,
-	fb_ioctl:	s3trio_ioctl,
 };
 
     /*
@@ -264,12 +261,6 @@ static int s3trio_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 }
 
 
-static int s3trio_ioctl(struct inode *inode, struct file *file, u_int cmd,
-			u_long arg, int con, struct fb_info *info)
-{
-    return -EINVAL;
-}
-
 int __init s3triofb_init(void)
 {
 #ifdef __powerpc__
diff --git a/drivers/video/acornfb.c b/drivers/video/acornfb.c
index 5412fef40..f504cddaf 100644
--- a/drivers/video/acornfb.c
+++ b/drivers/video/acornfb.c
@@ -1111,13 +1111,6 @@ acornfb_pan_display(struct fb_var_screeninfo *var, int con,
 	return 0;
 }
 
-static int
-acornfb_ioctl(struct inode *ino, struct file *file, unsigned int cmd,
-	      unsigned long arg, int con, struct fb_info *info)
-{
-	return -ENOIOCTLCMD;
-}
-
 static struct fb_ops acornfb_ops = {
 	owner:		THIS_MODULE,
 	fb_get_fix:	acornfb_get_fix,
@@ -1126,7 +1119,6 @@ static struct fb_ops acornfb_ops = {
 	fb_get_cmap:	acornfb_get_cmap,
 	fb_set_cmap:	acornfb_set_cmap,
 	fb_pan_display:	acornfb_pan_display,
-	fb_ioctl:	acornfb_ioctl,
 };
 
 static int
diff --git a/drivers/video/aty128fb.c b/drivers/video/aty128fb.c
index 192cb278b..ef0871369 100644
--- a/drivers/video/aty128fb.c
+++ b/drivers/video/aty128fb.c
@@ -325,8 +325,6 @@ static int aty128fb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 			struct fb_info *info);
 static int aty128fb_pan_display(struct fb_var_screeninfo *var, int con,
 			   struct fb_info *fb);
-static int aty128fb_ioctl(struct inode *inode, struct file *file, u_int cmd,
-		     u_long arg, int con, struct fb_info *info);
 static int aty128fb_rasterimg(struct fb_info *info, int start);
 
 
@@ -418,7 +416,6 @@ static struct fb_ops aty128fb_ops = {
 	fb_get_cmap:	aty128fb_get_cmap,
 	fb_set_cmap:	aty128fb_set_cmap,
 	fb_pan_display:	aty128fb_pan_display,
-	fb_ioctl:	aty128fb_ioctl,
 	fb_rasterimg:	aty128fb_rasterimg,
 };
 
@@ -1587,17 +1584,6 @@ aty128fb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
     return 0;                
 }
 
-    /*
-     *  Frame Buffer Specific ioctls
-     */
-
-static int
-aty128fb_ioctl(struct inode *inode, struct file *file, u_int cmd,
-		     u_long arg, int con, struct fb_info *info)
-{
-    return -EINVAL;
-}
-
 
 static int
 aty128fb_rasterimg(struct fb_info *info, int start)
diff --git a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c
index 974d2adc7..96a3b9a79 100644
--- a/drivers/video/chipsfb.c
+++ b/drivers/video/chipsfb.c
@@ -121,14 +121,10 @@ static int chips_get_var(struct fb_var_screeninfo *var, int con,
 			 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 @@ static struct fb_ops chipsfb_ops = {
 	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 @@ static int chips_set_var(struct fb_var_screeninfo *var, int con,
 	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)
 {
@@ -226,12 +212,6 @@ static int chips_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 	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)
 {
 	struct fb_info_chips *p = (struct fb_info_chips *) info;
diff --git a/drivers/video/clgenfb.c b/drivers/video/clgenfb.c
index a0999093f..a88919d65 100644
--- a/drivers/video/clgenfb.c
+++ b/drivers/video/clgenfb.c
@@ -472,9 +472,6 @@ int clgenfb_setup (char *options);
 
 static int clgenfb_open (struct fb_info *info, int user);
 static int clgenfb_release (struct fb_info *info, int user);
-static int clgenfb_ioctl (struct inode *inode, struct file *file,
-		   unsigned int cmd, unsigned long arg, int con,
-		   struct fb_info *info);
 #if defined(CONFIG_FB_OF)
 int clgen_of_init (struct device_node *dp);
 #endif
@@ -490,7 +487,6 @@ static struct fb_ops clgenfb_ops = {
 	fb_get_cmap:	fbgen_get_cmap,
 	fb_set_cmap:	fbgen_set_cmap,
 	fb_pan_display:	fbgen_pan_display,
-	fb_ioctl:	clgenfb_ioctl,
 };
 
 /*--- Hardware Specific Routines -------------------------------------------*/
@@ -646,16 +642,6 @@ static int clgenfb_release (struct fb_info *info, int user)
 	return 0;
 }
 
-/*--- handle /dev/fbx ioctl calls ------------------------------------------*/
-static int clgenfb_ioctl (struct inode *inode, struct file *file,
-		   unsigned int cmd, unsigned long arg, int con,
-		   struct fb_info *info)
-{
-	DPRINTK ("ENTER\n");
-	/* Nothing exciting here... */
-	DPRINTK ("EXIT\n");
-	return -EINVAL;
-}
 /**** END   Interface used by the World *************************************/
 /****************************************************************************/
 /**** BEGIN Hardware specific Routines **************************************/
diff --git a/drivers/video/controlfb.c b/drivers/video/controlfb.c
index f6a70e3a4..10453891d 100644
--- a/drivers/video/controlfb.c
+++ b/drivers/video/controlfb.c
@@ -122,8 +122,6 @@ static int control_get_cmap(struct fb_cmap *cmap, int kspc, int con,
 			  struct fb_info *info);
 static int control_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 			  struct fb_info *info);
-static int control_ioctl(struct inode *inode, struct file *file, u_int cmd,
-		       u_long arg, int con, struct fb_info *info);
 
 
 static int controlfb_getcolreg(u_int regno, u_int *red, u_int *green,
@@ -175,7 +173,6 @@ static struct fb_ops controlfb_ops = {
 	fb_get_cmap:	control_get_cmap,
 	fb_set_cmap:	control_set_cmap,
 	fb_pan_display:	control_pan_display,
-	fb_ioctl:	control_ioctl,
 };
 
 
@@ -331,12 +328,6 @@ static int control_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 	return 0;
 }
 
-static int control_ioctl(struct inode *inode, struct file *file, u_int cmd,
-		       u_long arg, int con, struct fb_info *info)
-{
-	return -EINVAL;
-}
-
 /********************  End of controlfb_ops implementation  ********************/
 /* (new one that is) */
 
diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c
index 7f9cac9a1..0a1473520 100644
--- a/drivers/video/cyber2000fb.c
+++ b/drivers/video/cyber2000fb.c
@@ -967,14 +967,6 @@ cyber2000fb_pan_display(struct fb_var_screeninfo *var, int con,
 }
 
 
-static int
-cyber2000fb_ioctl(struct inode *inode, struct file *file, u_int cmd,
-		  u_long arg, int con, struct fb_info *info)
-{
-	return -EINVAL;
-}
-
-
 /*
  *    Update the `var' structure (called by fbcon.c)
  *
@@ -1122,7 +1114,6 @@ static struct fb_ops cyber2000fb_ops = {
 	fb_set_var:	cyber2000fb_set_var,
 	fb_set_cmap:	cyber2000fb_set_cmap,
 	fb_pan_display:	cyber2000fb_pan_display,
-	fb_ioctl:	cyber2000fb_ioctl,
 	fb_get_fix:	gen_get_fix,
 	fb_get_var:	gen_get_var,
 	fb_get_cmap:	gen_get_cmap,
diff --git a/drivers/video/cyberfb.c b/drivers/video/cyberfb.c
index 396a7befc..20b8c4b2a 100644
--- a/drivers/video/cyberfb.c
+++ b/drivers/video/cyberfb.c
@@ -251,10 +251,6 @@ static int cyberfb_get_cmap(struct fb_cmap *cmap, int kspc, int con,
 			    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 @@ static int cyberfb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 }
 
 
-/*
- *    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 @@ static struct fb_ops cyberfb_ops = {
 	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)
diff --git a/drivers/video/dn_cfb4.c b/drivers/video/dn_cfb4.c
index 18ec1b79b..5d7ab81a5 100644
--- a/drivers/video/dn_cfb4.c
+++ b/drivers/video/dn_cfb4.c
@@ -121,10 +121,6 @@ static int dn_fb_get_cmap(struct fb_cmap *cmap,int kspc,int con,
 			  struct fb_info *info);
 static int dn_fb_set_cmap(struct fb_cmap *cmap,int kspc,int con,
 			  struct fb_info *info);
-static int dn_fb_pan_display(struct fb_var_screeninfo *var, int con,
-			     struct fb_info *info);
-static int dn_fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
-		       unsigned long arg, int con, struct fb_info *info);
 
 static int dnfbcon_switch(int con,struct fb_info *info);
 static int dnfbcon_updatevar(int con,struct fb_info *info);
@@ -141,8 +137,6 @@ static struct fb_ops dn_fb_ops = {
 	fb_set_var:	dn_fb_set_var,
 	fb_get_cmap:	dn_fb_get_cmap,
 	fb_set_cmap:	dn_fb_set_cmap,
-	fb_pan_display:	dn_fb_pan_display,
-	fb_ioctl:	dn_fb_ioctl,
 };
 
 static int currcon=0;
@@ -266,24 +260,6 @@ static int dn_fb_set_cmap(struct fb_cmap *cmap,int kspc,int con,
 
 }
 
-static int dn_fb_pan_display(struct fb_var_screeninfo *var, int con,
-			     struct fb_info *info) {
-
-	printk("panning not supported\n");
-
-	return -EINVAL;
-
-}
-
-static int dn_fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
-		    unsigned long arg, int con, struct fb_info *info) {
-
-	printk("no IOCTLs as of yet.\n");
-
-	return -EINVAL;
-
-}
-
 static void dn_fb_set_disp(int con, struct fb_info *info) {
 
   struct fb_fix_screeninfo fix;
diff --git a/drivers/video/dn_cfb8.c b/drivers/video/dn_cfb8.c
index 5452f1534..fa2cb1e67 100644
--- a/drivers/video/dn_cfb8.c
+++ b/drivers/video/dn_cfb8.c
@@ -122,10 +122,6 @@ static int dn_fb_get_cmap(struct fb_cmap *cmap,int kspc,int con,
 			  struct fb_info *info);
 static int dn_fb_set_cmap(struct fb_cmap *cmap,int kspc,int con,
 			  struct fb_info *info);
-static int dn_fb_pan_display(struct fb_var_screeninfo *var, int con,
-			     struct fb_info *info);
-static int dn_fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
-		       unsigned long arg, int con, struct fb_info *info);
 
 static int dnfbcon_switch(int con,struct fb_info *info);
 static int dnfbcon_updatevar(int con,struct fb_info *info);
@@ -142,8 +138,6 @@ static struct fb_ops dn_fb_ops = {
 	fb_set_var:	dn_fb_set_var,
 	fb_get_cmap:	dn_fb_get_cmap,
 	fb_set_cmap:	dn_fb_set_cmap,
-	fb_pan_display:	dn_fb_pan_display,
-	fb_ioctl:	dn_fb_ioctl,
 };
 
 static int currcon=0;
@@ -267,24 +261,6 @@ static int dn_fb_set_cmap(struct fb_cmap *cmap,int kspc,int con,
 
 }
 
-static int dn_fb_pan_display(struct fb_var_screeninfo *var, int con,
-			     struct fb_info *info) {
-
-	printk("panning not supported\n");
-
-	return -EINVAL;
-
-}
-
-static int dn_fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
-		    unsigned long arg, int con, struct fb_info *info) {
-
-	printk("no IOCTLs as of yet.\n");
-
-	return -EINVAL;
-
-}
-
 static void dn_fb_set_disp(int con, struct fb_info *info) {
 
   struct fb_fix_screeninfo fix;
diff --git a/drivers/video/dnfb.c b/drivers/video/dnfb.c
index 238f29555..6fd59a64d 100644
--- a/drivers/video/dnfb.c
+++ b/drivers/video/dnfb.c
@@ -127,10 +127,6 @@ static int dn_fb_get_cmap(struct fb_cmap *cmap,int kspc,int con,
 			  struct fb_info *info);
 static int dn_fb_set_cmap(struct fb_cmap *cmap,int kspc,int con,
 			  struct fb_info *info);
-static int dn_fb_pan_display(struct fb_var_screeninfo *var, int con,
-			     struct fb_info *info);
-static int dn_fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
-		       unsigned long arg, int con, struct fb_info *info);
 
 static int dnfbcon_switch(int con,struct fb_info *info);
 static int dnfbcon_updatevar(int con,struct fb_info *info);
@@ -147,8 +143,6 @@ static struct fb_ops dn_fb_ops = {
 	fb_set_var:	dn_fb_set_var,
 	fb_get_cmap:	dn_fb_get_cmap,
 	fb_set_cmap:	dn_fb_set_cmap,
-	fb_pan_display:	dn_fb_pan_display,
-	fb_ioctl:	dn_fb_ioctl,
 };
 
 static int currcon=0;
@@ -272,24 +266,6 @@ static int dn_fb_set_cmap(struct fb_cmap *cmap,int kspc,int con,
 
 }
 
-static int dn_fb_pan_display(struct fb_var_screeninfo *var, int con,
-			     struct fb_info *info) {
-
-	printk("panning not supported\n");
-
-	return -EINVAL;
-
-}
-
-static int dn_fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
-		    unsigned long arg, int con, struct fb_info *info) {
-
-	printk("no IOCTLs as of yet.\n");
-
-	return -EINVAL;
-
-}
-
 static void dn_fb_set_disp(int con, struct fb_info *info) {
 
   struct fb_fix_screeninfo fix;
diff --git a/drivers/video/fbgen.c b/drivers/video/fbgen.c
index 4be9b41d8..835c93d02 100644
--- a/drivers/video/fbgen.c
+++ b/drivers/video/fbgen.c
@@ -190,17 +190,6 @@ int fbgen_pan_display(struct fb_var_screeninfo *var, int con,
 }
 
 
-    /*
-     *  Frame Buffer Specific ioctls
-     */
-
-int fbgen_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
-		unsigned long arg, int con, struct fb_info *info)
-{
-    return -EINVAL;
-}
-
-
 /* ---- Helper functions --------------------------------------------------- */
 
 
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index bf34ca0da..9cb20fc0d 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -411,6 +411,8 @@ fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
 	case FBIOPAN_DISPLAY:
 		if (copy_from_user(&var, (void *) arg, sizeof(var)))
 			return -EFAULT;
+		if (fb->fb_pan_display == NULL)
+			return (var.xoffset || var.yoffset) ? -EINVAL : 0;
 		if ((i=fb->fb_pan_display(&var, PROC_CONSOLE(info), info)))
 			return i;
 		if (copy_to_user((void *) arg, &var, sizeof(var)))
@@ -450,6 +452,8 @@ fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
 		(*info->blank)(arg, info);
 		return 0;
 	default:
+		if (fb->fb_ioctl == NULL)
+			return -EINVAL;
 		return fb->fb_ioctl(inode, file, cmd, arg, PROC_CONSOLE(info),
 				    info);
 	}
diff --git a/drivers/video/fm2fb.c b/drivers/video/fm2fb.c
index 4888735fe..d9f5c0579 100644
--- a/drivers/video/fm2fb.c
+++ b/drivers/video/fm2fb.c
@@ -189,14 +189,10 @@ static int fm2fb_get_var(struct fb_var_screeninfo *var, int con,
 			 struct fb_info *info);
 static int fm2fb_set_var(struct fb_var_screeninfo *var, int con,
 			 struct fb_info *info);
-static int fm2fb_pan_display(struct fb_var_screeninfo *var, int con,
-			     struct fb_info *info);
 static int fm2fb_get_cmap(struct fb_cmap *cmap, int kspc, int con,
 			  struct fb_info *info);
 static int fm2fb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 			  struct fb_info *info);
-static int fm2fb_ioctl(struct inode *inode, struct file *file, u_int cmd,
-		       u_long arg, int con, struct fb_info *info);
 
 
     /*
@@ -227,8 +223,6 @@ static struct fb_ops fm2fb_ops = {
 	fb_set_var:	fm2fb_set_var,
 	fb_get_cmap:	fm2fb_get_cmap,
 	fb_set_cmap:	fm2fb_set_cmap,
-	fb_pan_display:	fm2fb_pan_display,
-	fb_ioctl:	fm2fb_ioctl,
 };
 
     /*
@@ -293,21 +287,6 @@ static int fm2fb_set_var(struct fb_var_screeninfo *var, int con,
 
 
     /*
-     *  Pan or Wrap the Display
-     *
-     *  This call looks only at xoffset, yoffset and the FB_VMODE_YWRAP flag
-     */
-
-static int fm2fb_pan_display(struct fb_var_screeninfo *var, int con,
-			     struct fb_info *info)
-{
-    if (var->xoffset || var->yoffset)
-	return -EINVAL;
-    else
-	return 0;
-}
-
-    /*
      *  Get the Colormap
      */
 
@@ -345,13 +324,6 @@ static int fm2fb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 }
 
 
-static int fm2fb_ioctl(struct inode *inode, struct file *file, u_int cmd,
-		       u_long arg, int con, struct fb_info *info)
-{
-    return -EINVAL;
-}
-
-
     /*
      *  Initialisation
      */
diff --git a/drivers/video/g364fb.c b/drivers/video/g364fb.c
index 447b1b613..1bbcc3fbd 100644
--- a/drivers/video/g364fb.c
+++ b/drivers/video/g364fb.c
@@ -103,8 +103,6 @@ static int g364fb_get_cmap(struct fb_cmap *cmap, int kspc, int con,
 			   struct fb_info *info);
 static int g364fb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 			   struct fb_info *info);
-static int g364fb_ioctl(struct inode *inode, struct file *file, u_int cmd,
-			u_long arg, int con, struct fb_info *info);
 
 
 /*
@@ -134,7 +132,6 @@ static struct fb_ops g364fb_ops = {
 	fb_get_cmap:	g364fb_get_cmap,
 	fb_set_cmap:	g364fb_set_cmap,
 	fb_pan_display:	g364fb_pan_display,
-	fb_ioctl:	g364fb_ioctl,
 };
 
 
@@ -277,13 +274,6 @@ static int g364fb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 }
 
 
-static int g364fb_ioctl(struct inode *inode, struct file *file, u_int cmd,
-			u_long arg, int con, struct fb_info *info)
-{
-    return -EINVAL;
-}
-
-
 /*
  *  Initialisation
  */
diff --git a/drivers/video/hgafb.c b/drivers/video/hgafb.c
index 3a5e48d9e..d2b09416b 100644
--- a/drivers/video/hgafb.c
+++ b/drivers/video/hgafb.c
@@ -514,21 +514,6 @@ int hga_pan_display(struct fb_var_screeninfo *var, int con,
 }
 
     
-	/*
-	 *  Frame Buffer Specific ioctls
-	 */
-
-int hga_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
-              unsigned long arg, int con, struct fb_info *info)
-{
-	CHKINFO(-EINVAL);
-	DPRINTK("hga_ioctl: con:%d\n", con);
-	return -EINVAL;
-}
-
-
-	
-	
 static struct fb_ops hgafb_ops = {
 	owner:		THIS_MODULE,
 	fb_get_fix:	hga_get_fix,
@@ -537,7 +522,6 @@ static struct fb_ops hgafb_ops = {
 	fb_get_cmap:	hga_get_cmap,
 	fb_set_cmap:	hga_set_cmap,
 	fb_pan_display:	hga_pan_display,
-	fb_ioctl:	hga_ioctl,
 };
 		
 
diff --git a/drivers/video/hitfb.c b/drivers/video/hitfb.c
index a422a7fe2..589823acd 100644
--- a/drivers/video/hitfb.c
+++ b/drivers/video/hitfb.c
@@ -250,16 +250,6 @@ static int hitfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
     return 0;
 }
 
-static int hitfb_pan_display(struct fb_var_screeninfo *var,
-			     struct hitfb_par *par, const struct fb_info *info)
-{
-    if (var->xoffset || var->yoffset)
-	return -EINVAL;
-    else
-	return 0;
-}
-
-
 static int hitfb_blank(int blank_mode, const struct fb_info *info)
 {
     return 0;
@@ -297,7 +287,7 @@ struct fbgen_hwswitch hitfb_switch = {
     hitfb_set_par,
     hitfb_getcolreg,
     hitfb_setcolreg,
-    hitfb_pan_display,
+    NULL,
     hitfb_blank,
     hitfb_set_disp
 };
@@ -309,8 +299,6 @@ static struct fb_ops hitfb_ops = {
 	fb_set_var:	fbgen_set_var,
 	fb_get_cmap:	fbgen_get_cmap,
 	fb_set_cmap:	fbgen_set_cmap,
-	fb_pan_display:	fbgen_pan_display,
-	fb_ioctl:	fbgen_ioctl,
 };
 
 
diff --git a/drivers/video/hpfb.c b/drivers/video/hpfb.c
index ab3e2e084..4bfc4a9ef 100644
--- a/drivers/video/hpfb.c
+++ b/drivers/video/hpfb.c
@@ -225,13 +225,6 @@ static void topcat_blit(int x0, int y0, int x1, int y1, int w, int h)
 	writeb(fb_bitmask, fb_regs + WMOVE);
 }
 
-static int hpfb_ioctl(struct inode *inode, struct file *file, 
-		       unsigned int cmd, unsigned long arg, int con,
-		       struct fb_info *info)
-{
-	return -EINVAL;
-}
-
 static int hpfb_switch(int con, struct fb_info *info)
 {
 	do_fb_set_var(&fb_display[con].var,1);
@@ -279,7 +272,6 @@ static struct fb_ops hpfb_ops = {
 	fb_set_var:	hpfb_set_var,
 	fb_get_cmap:	hpfb_get_cmap,
 	fb_set_cmap:	hpfb_set_cmap,
-	fb_ioctl:	hpfb_ioctl,
 };
 
 #define TOPCAT_FBOMSB	0x5d
diff --git a/drivers/video/igafb.c b/drivers/video/igafb.c
index 5ce2f2648..ac176a8cf 100644
--- a/drivers/video/igafb.c
+++ b/drivers/video/igafb.c
@@ -431,19 +431,6 @@ static int igafb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
         return 0;
 }
 
-static int igafb_pan_display(struct fb_var_screeninfo *var, int con,
-                             struct fb_info *info)
-{
-        /* no panning */
-        return -EINVAL;
-}
-
-static int igafb_ioctl(struct inode *inode, struct file *file, u_int cmd,
-		       u_long arg, int con, struct fb_info *info)
-{
-	return -EINVAL;
-}
-
 /*
  * Framebuffer option structure
  */
@@ -454,8 +441,6 @@ static struct fb_ops igafb_ops = {
 	fb_set_var:	igafb_set_var,
 	fb_get_cmap:	igafb_get_cmap,
 	fb_set_cmap:	igafb_set_cmap,
-	fb_pan_display:	igafb_pan_display,
-	fb_ioctl:	igafb_ioctl,
 #ifdef __sparc__
 	fb_mmap:	igafb_mmap,
 #endif
diff --git a/drivers/video/macfb.c b/drivers/video/macfb.c
index 627206e57..a5c173aa2 100644
--- a/drivers/video/macfb.c
+++ b/drivers/video/macfb.c
@@ -830,19 +830,6 @@ static int macfb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 	return 0;
 }
 
-static int macfb_ioctl(struct inode *inode, struct file *file,
-		       unsigned int cmd, unsigned long arg, int con,
-		       struct fb_info *info)
-{
-	return -EINVAL;
-}
-
-static int macfb_pan_display(struct fb_var_screeninfo *var, int con,
-			     struct fb_info *info)
-{
-	return -EINVAL;
-}
-
 static struct fb_ops macfb_ops = {
 	owner:		THIS_MODULE,
 	fb_get_fix:	macfb_get_fix,
@@ -850,8 +837,6 @@ static struct fb_ops macfb_ops = {
 	fb_set_var:	macfb_set_var,
 	fb_get_cmap:	macfb_get_cmap,
 	fb_set_cmap:	macfb_set_cmap,
-	fb_pan_display:	macfb_pan_display,
-	fb_ioctl:	macfb_ioctl,
 };
 
 void macfb_setup(char *options, int *ints)
diff --git a/drivers/video/offb.c b/drivers/video/offb.c
index d98ab4e0e..69bb8cc72 100644
--- a/drivers/video/offb.c
+++ b/drivers/video/offb.c
@@ -83,14 +83,10 @@ static int offb_get_var(struct fb_var_screeninfo *var, int con,
 			struct fb_info *info);
 static int offb_set_var(struct fb_var_screeninfo *var, int con,
 			struct fb_info *info);
-static int offb_pan_display(struct fb_var_screeninfo *var, int con,
-			struct fb_info *info);
 static int offb_get_cmap(struct fb_cmap *cmap, int kspc, int con,
 			struct fb_info *info);
 static int offb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 			struct fb_info *info);
-static int offb_ioctl(struct inode *inode, struct file *file, u_int cmd,
-			    u_long arg, int con, struct fb_info *info);
 
 extern boot_infos_t *boot_infos;
 
@@ -127,8 +123,6 @@ static struct fb_ops offb_ops = {
 	fb_set_var:	offb_set_var,
 	fb_get_cmap:	offb_get_cmap,
 	fb_set_cmap:	offb_set_cmap,
-	fb_pan_display:	offb_pan_display,
-	fb_ioctl:	offb_ioctl,
 };
 
     /*
@@ -200,21 +194,6 @@ static int offb_set_var(struct fb_var_screeninfo *var, int con,
 
 
     /*
-     *  Pan or Wrap the Display
-     *
-     *  This call looks only at xoffset, yoffset and the FB_VMODE_YWRAP flag
-     */
-
-static int offb_pan_display(struct fb_var_screeninfo *var, int con,
-			    struct fb_info *info)
-{
-    if (var->xoffset || var->yoffset)
-	return -EINVAL;
-    else
-	return 0;
-}
-
-    /*
      *  Get the Colormap
      */
 
@@ -259,13 +238,6 @@ static int offb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 }
 
 
-static int offb_ioctl(struct inode *inode, struct file *file, u_int cmd,
-		      u_long arg, int con, struct fb_info *info)
-{
-    return -EINVAL;
-}
-
-
 #ifdef CONFIG_FB_S3TRIO
 extern void s3triofb_init_of(struct device_node *dp);
 #endif /* CONFIG_FB_S3TRIO */
diff --git a/drivers/video/platinumfb.c b/drivers/video/platinumfb.c
index 97b787d4f..3bbd7fe48 100644
--- a/drivers/video/platinumfb.c
+++ b/drivers/video/platinumfb.c
@@ -107,14 +107,10 @@ static int platinum_get_var(struct fb_var_screeninfo *var, int con,
 			    struct fb_info *fb);
 static int platinum_set_var(struct fb_var_screeninfo *var, int con,
 			    struct fb_info *fb);
-static int platinum_pan_display(struct fb_var_screeninfo *var, int con,
-				struct fb_info *fb);
 static int platinum_get_cmap(struct fb_cmap *cmap, int kspc, int con,
 			     struct fb_info *info);
 static int platinum_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 			     struct fb_info *info);
-static int platinum_ioctl(struct inode *inode, struct file *file, u_int cmd,
-			  u_long arg, int con, struct fb_info *info);
 
 
 /*
@@ -170,8 +166,6 @@ static struct fb_ops platinumfb_ops = {
 	fb_set_var:	platinum_set_var,
 	fb_get_cmap:	platinum_get_cmap,
 	fb_set_cmap:	platinum_set_cmap,
-	fb_pan_display:	platinum_pan_display,
-	fb_ioctl:	platinum_ioctl,
 };
 
 static int platinum_get_fix(struct fb_fix_screeninfo *fix, int con,
@@ -299,20 +293,6 @@ static int platinum_set_var(struct fb_var_screeninfo *var, int con,
 	return 0;
 }
 
-static int platinum_pan_display(struct fb_var_screeninfo *var, int con,
-				struct fb_info *info)
-{
-    /*
-     *  Pan (or wrap, depending on the `vmode' field) the display using the
-     *  `xoffset' and `yoffset' fields of the `var' structure.
-     *  If the values don't fit, return -EINVAL.
-     */
-
-	if (var->xoffset != 0 || var->yoffset != 0)
-		return -EINVAL;
-	return 0;
-}
-
 static int platinum_get_cmap(struct fb_cmap *cmap, int kspc, int con,
 			     struct fb_info *info)
 {
@@ -352,13 +332,6 @@ static int platinum_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 	return 0;
 }
 
-static int platinum_ioctl(struct inode *inode, struct file *file, u_int cmd,
-			  u_long arg, int con, struct fb_info *info)
-{
-	printk(KERN_ERR "platinum_ioctl not yet implemented\n");
-	return -EINVAL;
-}
-
 static int platinum_switch(int con, struct fb_info *fb)
 {
 	struct fb_info_platinum *info = (struct fb_info_platinum *) fb;
diff --git a/drivers/video/q40fb.c b/drivers/video/q40fb.c
index 12175a1f8..2b798e05d 100644
--- a/drivers/video/q40fb.c
+++ b/drivers/video/q40fb.c
@@ -39,8 +39,6 @@ static int q40fb_get_cmap(struct fb_cmap *cmap,int kspc,int con,
 			 struct fb_info *info);
 static int q40fb_set_cmap(struct fb_cmap *cmap,int kspc,int con,
 			 struct fb_info *info);
-static int q40fb_pan_display(struct fb_var_screeninfo *var, int con,
-			    struct fb_info *info);
 static int q40fb_ioctl(struct inode *inode, struct file *file,
 		      unsigned int cmd, unsigned long arg, int con,
 		      struct fb_info *info);
@@ -60,7 +58,6 @@ static struct fb_ops q40fb_ops = {
 	fb_set_var:	q40fb_set_var,
 	fb_get_cmap:	q40fb_get_cmap,
 	fb_set_cmap:	q40fb_set_cmap,
-	fb_pan_display:	q40fb_pan_display,
 	fb_ioctl:	q40fb_ioctl,
 };
 
@@ -254,15 +251,6 @@ static int q40fb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 #endif
 }
 
-static int q40fb_pan_display(struct fb_var_screeninfo *var, int con,
-			    struct fb_info *info)
-{
-	printk(KERN_ERR "panning not supported\n");
-
-	return -EINVAL;
-
-}
-
 static int q40fb_ioctl(struct inode *inode, struct file *file,
 		      unsigned int cmd, unsigned long arg, int con,
 		      struct fb_info *info)
diff --git a/drivers/video/retz3fb.c b/drivers/video/retz3fb.c
index 5dda9d19c..ef39926ab 100644
--- a/drivers/video/retz3fb.c
+++ b/drivers/video/retz3fb.c
@@ -277,11 +277,6 @@ static int retz3fb_get_cmap(struct fb_cmap *cmap, int kspc, int con,
 			    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 @@ static int retz3fb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 }
 
 
-/*
- *    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 @@ static struct fb_ops retz3fb_ops = {
 	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,
 };
 
 
diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c
index eb98ba112..df2d81b66 100644
--- a/drivers/video/sa1100fb.c
+++ b/drivers/video/sa1100fb.c
@@ -158,13 +158,10 @@ static struct sa1100fb_lcd_reg lcd_shadow;
 
 
 static int  sa1100fb_get_fix(struct fb_fix_screeninfo *fix, int con, struct fb_info *info);
-static int  sa1100fb_ioctl(struct inode *ino, struct file *file, unsigned int cmd,
-	       		  unsigned long arg, int con, struct fb_info *info);
 static int  sa1100fb_get_var(struct fb_var_screeninfo *var, int con, struct fb_info *info);
 static int  sa1100fb_set_var(struct fb_var_screeninfo *var, int con, struct fb_info *info);
 static int  sa1100fb_get_cmap(struct fb_cmap *cmap, int kspc, int con, struct fb_info *info);
 static int  sa1100fb_set_cmap(struct fb_cmap *cmap, int kspc, int con, struct fb_info *info);
-static int  sa1100fb_pan_display(struct fb_var_screeninfo *var, int con, struct fb_info *info);
  
 static int  sa1100fb_switch(int con, struct fb_info *info);
 static void sa1100fb_blank(int blank, struct fb_info *info);
@@ -180,8 +177,6 @@ static struct fb_ops sa1100fb_ops = {
 	fb_set_var:	sa1100fb_set_var,
 	fb_get_cmap:	sa1100fb_get_cmap,
 	fb_set_cmap:	sa1100fb_set_cmap,
-	fb_pan_display:	sa1100fb_pan_display,
-	fb_ioctl:	sa1100fb_ioctl,
 };
 
 
@@ -1095,15 +1090,6 @@ static void sa1100fb_enable_lcd_controller(void)
 	restore_flags(flags);
 }
 
-static int
-sa1100fb_pan_display(struct fb_var_screeninfo *var, int con,
-		    struct fb_info *info)
-{
-	DPRINTK("entered\n");
-	return -EINVAL;
-}
-
-
 /*
  * sa1100fb_blank():
  *	Blank the display by setting all palette values to zero.  Note, the 
@@ -1217,13 +1203,3 @@ int __init sa1100fb_setup(char *options)
 	return 0;
 }
 
-
-
-static int
-sa1100fb_ioctl(struct inode *ino, struct file *file, unsigned int cmd,
-	      unsigned long arg, int con, struct fb_info *info)
-{
-	return -ENOIOCTLCMD;
-}
-
-
diff --git a/drivers/video/sbusfb.c b/drivers/video/sbusfb.c
index 408b2b000..63d2b7c76 100644
--- a/drivers/video/sbusfb.c
+++ b/drivers/video/sbusfb.c
@@ -85,8 +85,6 @@ static int sbusfb_get_var(struct fb_var_screeninfo *var, int con,
 			struct fb_info *info);
 static int sbusfb_set_var(struct fb_var_screeninfo *var, int con,
 			struct fb_info *info);
-static int sbusfb_pan_display(struct fb_var_screeninfo *var, int con,
-			struct fb_info *info);
 static int sbusfb_get_cmap(struct fb_cmap *cmap, int kspc, int con,
 			struct fb_info *info);
 static int sbusfb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
@@ -125,7 +123,6 @@ static struct fb_ops sbusfb_ops = {
 	fb_set_var:	sbusfb_set_var,
 	fb_get_cmap:	sbusfb_get_cmap,
 	fb_set_cmap:	sbusfb_set_cmap,
-	fb_pan_display:	sbusfb_pan_display,
 	fb_ioctl:	sbusfb_ioctl,
 	fb_mmap:	sbusfb_mmap,
 };
@@ -402,21 +399,6 @@ static int sbusfb_set_var(struct fb_var_screeninfo *var, int con,
 }
 
     /*
-     *  Pan or Wrap the Display
-     *
-     *  This call looks only at xoffset, yoffset and the FB_VMODE_YWRAP flag
-     */
-
-static int sbusfb_pan_display(struct fb_var_screeninfo *var, int con,
-			      struct fb_info *info)
-{
-	if (var->xoffset || var->yoffset)
-		return -EINVAL;
-	else
-		return 0;
-}
-
-    /*
      *  Hardware cursor
      */
      
diff --git a/drivers/video/sgivwfb.c b/drivers/video/sgivwfb.c
index 0a180d5a6..7fcbf0bd5 100644
--- a/drivers/video/sgivwfb.c
+++ b/drivers/video/sgivwfb.c
@@ -97,14 +97,10 @@ static int sgivwfb_get_var(struct fb_var_screeninfo *var, int con,
 			   struct fb_info *info);
 static int sgivwfb_set_var(struct fb_var_screeninfo *var, int con,
 			   struct fb_info *info);
-static int sgivwfb_pan_display(struct fb_var_screeninfo *var, int con,
-			       struct fb_info *info);
 static int sgivwfb_get_cmap(struct fb_cmap *cmap, int kspc, int con,
 			    struct fb_info *info);
 static int sgivwfb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 			    struct fb_info *info);
-static int sgivwfb_ioctl(struct inode *inode, struct file *file, u_int cmd,
-			 u_long arg, int con, struct fb_info *info);
 static int sgivwfb_mmap(struct fb_info *info, struct file *file,
                         struct vm_area_struct *vma);
 
@@ -115,8 +111,6 @@ static struct fb_ops sgivwfb_ops = {
 	fb_set_var:	sgivwfb_set_var,
 	fb_get_cmap:	sgivwfb_get_cmap,
 	fb_set_cmap:	sgivwfb_set_cmap,
-	fb_pan_display:	sgivwfb_pan_display,
-	fb_ioctl:	sgivwfb_ioctl,
 	fb_mmap:	sgivwfb_mmap,
 };
 
@@ -805,39 +799,6 @@ static int sgivwfb_set_var(struct fb_var_screeninfo *var, int con,
 }
 
 /*
- *  Pan or Wrap the Display
- *
- *  This call looks only at xoffset, yoffset and the FB_VMODE_YWRAP flag
- */
-
-static int sgivwfb_pan_display(struct fb_var_screeninfo *var, int con,
-			       struct fb_info *info)
-{
-#if 0
-  if (var->vmode & FB_VMODE_YWRAP) {
-    if (var->yoffset < 0 ||
-	var->yoffset >= fb_display[con].var.yres_virtual ||
-	var->xoffset)
-      return -EINVAL;
-  } else {
-    if (var->xoffset+fb_display[con].var.xres >
-	fb_display[con].var.xres_virtual ||
-	var->yoffset+fb_display[con].var.yres >
-	fb_display[con].var.yres_virtual)
-      return -EINVAL;
-  }
-  fb_display[con].var.xoffset = var->xoffset;
-  fb_display[con].var.yoffset = var->yoffset;
-  if (var->vmode & FB_VMODE_YWRAP)
-    fb_display[con].var.vmode |= FB_VMODE_YWRAP;
-  else
-    fb_display[con].var.vmode &= ~FB_VMODE_YWRAP;
-  return 0;
-#endif
-  return -EINVAL;
-}
-
-/*
  *  Get the Colormap
  */
 static int sgivwfb_get_cmap(struct fb_cmap *cmap, int kspc, int con,
@@ -873,15 +834,6 @@ static int sgivwfb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
   return 0;
 }
 
-/*
- *  Virtual Frame Buffer Specific ioctls
- */
-static int sgivwfb_ioctl(struct inode *inode, struct file *file, u_int cmd,
-			 u_long arg, int con, struct fb_info *info)
-{
-  return -EINVAL;
-}
-
 static int sgivwfb_mmap(struct fb_info *info, struct file *file,
                         struct vm_area_struct *vma)
 {
diff --git a/drivers/video/sisfb.c b/drivers/video/sisfb.c
index 763ec0d4f..994e8732e 100644
--- a/drivers/video/sisfb.c
+++ b/drivers/video/sisfb.c
@@ -434,8 +434,6 @@ static int sisfb_get_cmap(struct fb_cmap *cmap, int kspc, int con,
 			  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 @@ static int sisfb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 	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 @@ static struct fb_ops sisfb_ops = {
 	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,
 };
diff --git a/drivers/video/skeletonfb.c b/drivers/video/skeletonfb.c
index 17efdadfe..f6cd0a21e 100644
--- a/drivers/video/skeletonfb.c
+++ b/drivers/video/skeletonfb.c
@@ -390,7 +390,7 @@ static struct fb_ops xxxfb_ops = {
 	fb_get_cmap:	fbgen_get_cmap,
 	fb_set_cmap:	fbgen_set_cmap,
 	fb_pan_display:	fbgen_pan_display,
-	fb_ioctl:	fbgen_ioctl,
+	fb_ioctl:	xxxfb_ioctl,   /* optional */
 };
 
 
diff --git a/drivers/video/sun3fb.c b/drivers/video/sun3fb.c
index be5de7bdb..3723325be 100644
--- a/drivers/video/sun3fb.c
+++ b/drivers/video/sun3fb.c
@@ -76,14 +76,10 @@ static int sun3fb_get_var(struct fb_var_screeninfo *var, int con,
 			struct fb_info *info);
 static int sun3fb_set_var(struct fb_var_screeninfo *var, int con,
 			struct fb_info *info);
-static int sun3fb_pan_display(struct fb_var_screeninfo *var, int con,
-			struct fb_info *info);
 static int sun3fb_get_cmap(struct fb_cmap *cmap, int kspc, int con,
 			struct fb_info *info);
 static int sun3fb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 			struct fb_info *info);
-static int sun3fb_ioctl(struct inode *inode, struct file *file, u_int cmd,
-			    u_long arg, int con, struct fb_info *info);
 static void sun3fb_cursor(struct display *p, int mode, int x, int y);
 static void sun3fb_clear_margin(struct display *p, int s);
 			    
@@ -114,8 +110,6 @@ static struct fb_ops sun3fb_ops = {
 	fb_set_var:	sun3fb_set_var,
 	fb_get_cmap:	sun3fb_get_cmap,
 	fb_set_cmap:	sun3fb_set_cmap,
-	fb_pan_display:	sun3fb_pan_display,
-	fb_ioctl:	sun3fb_ioctl,
 };
 
 static void sun3fb_clear_margin(struct display *p, int s)
@@ -231,21 +225,6 @@ static int sun3fb_set_var(struct fb_var_screeninfo *var, int con,
 }
 
     /*
-     *  Pan or Wrap the Display
-     *
-     *  This call looks only at xoffset, yoffset and the FB_VMODE_YWRAP flag
-     */
-
-static int sun3fb_pan_display(struct fb_var_screeninfo *var, int con,
-			      struct fb_info *info)
-{
-	if (var->xoffset || var->yoffset)
-		return -EINVAL;
-	else
-		return 0;
-}
-
-    /*
      *  Hardware cursor
      */
      
@@ -351,12 +330,6 @@ static int sun3fb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 	return 0;
 }
 
-static int sun3fb_ioctl(struct inode *inode, struct file *file, u_int cmd,
-			u_long arg, int con, struct fb_info *info)
-{
-	return -EINVAL;
-}
-
     /*
      *  Setup: parse used options
      */
diff --git a/drivers/video/tgafb.c b/drivers/video/tgafb.c
index 1ac719ee7..7572891d6 100644
--- a/drivers/video/tgafb.c
+++ b/drivers/video/tgafb.c
@@ -279,8 +279,6 @@ static int tgafb_getcolreg(u_int regno, u_int *red, u_int *green, u_int *blue,
 		u_int *transp, struct fb_info *info);
 static int tgafb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, 
 		u_int transp, struct fb_info *info);
-static int tgafb_pan_display(const struct fb_var_screeninfo *var,
-		struct fb_info_gen *info);
 static int tgafb_blank(int blank, struct fb_info_gen *info);
 static void tgafb_set_disp(const void *fb_par, struct display *disp, 
 		struct fb_info_gen *info);
@@ -780,16 +778,6 @@ static void tgafb_update_palette(void)
 #endif
 
 
-static int tgafb_pan_display(const struct fb_var_screeninfo *var, 
-	                             struct fb_info_gen *info)
-{
-    if (var->xoffset || var->yoffset)
-	return -EINVAL;
-    else
-	return 0;
-}
-
-
 static int tgafb_blank(int blank, struct fb_info_gen *info)
 {
     static int tga_vesa_blanked = 0;
@@ -869,7 +857,7 @@ static void tgafb_set_disp(const void *fb_par, struct display *disp,
 
 struct fbgen_hwswitch tgafb_hwswitch = {
     tgafb_detect, tgafb_encode_fix, tgafb_decode_var, tgafb_encode_var, tgafb_get_par,
-    tgafb_set_par, tgafb_getcolreg, tgafb_setcolreg, tgafb_pan_display, tgafb_blank, 
+    tgafb_set_par, tgafb_getcolreg, tgafb_setcolreg, NULL, tgafb_blank, 
     tgafb_set_disp
 };
 
@@ -890,8 +878,6 @@ static struct fb_ops tgafb_ops = {
 	fb_set_var:	fbgen_set_var,
 	fb_get_cmap:	fbgen_get_cmap,
 	fb_set_cmap:	tgafb_set_cmap,
-	fb_pan_display:	fbgen_pan_display,
-	fb_ioctl:	fbgen_ioctl,
 };
 
 
diff --git a/drivers/video/valkyriefb.c b/drivers/video/valkyriefb.c
index 23fc97915..6739cecf9 100644
--- a/drivers/video/valkyriefb.c
+++ b/drivers/video/valkyriefb.c
@@ -123,14 +123,10 @@ static int valkyrie_get_var(struct fb_var_screeninfo *var, int con,
 			 struct fb_info *info);
 static int valkyrie_set_var(struct fb_var_screeninfo *var, int con,
 			 struct fb_info *info);
-static int valkyrie_pan_display(struct fb_var_screeninfo *var, int con,
-			     struct fb_info *info);
 static int valkyrie_get_cmap(struct fb_cmap *cmap, int kspc, int con,
 			  struct fb_info *info);
 static int valkyrie_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 			  struct fb_info *info);
-static int valkyrie_ioctl(struct inode *inode, struct file *file, u_int cmd,
-		       u_long arg, int con, struct fb_info *info);
 
 static int read_valkyrie_sense(struct fb_info_valkyrie *p);
 static inline int valkyrie_vram_reqd(int video_mode, int color_mode);
@@ -155,8 +151,6 @@ static struct fb_ops valkyriefb_ops = {
 	fb_set_var:	valkyrie_set_var,
 	fb_get_cmap:	valkyrie_get_cmap,
 	fb_set_cmap:	valkyrie_set_cmap,
-	fb_pan_display:	valkyrie_pan_display,
-	fb_ioctl:	valkyrie_ioctl,
 };
 
 static int valkyriefb_getcolreg(u_int regno, u_int *red, u_int *green,
@@ -239,14 +233,6 @@ static int valkyrie_set_var(struct fb_var_screeninfo *var, int con,
 	return 0;
 }
 
-static int valkyrie_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 valkyrie_get_cmap(struct fb_cmap *cmap, int kspc, int con,
 			  struct fb_info *info)
 {
@@ -285,12 +271,6 @@ static int valkyrie_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 	return 0;
 }
 
-static int valkyrie_ioctl(struct inode *inode, struct file *file, u_int cmd,
-		       u_long arg, int con, struct fb_info *info)
-{
-	return -EINVAL;
-}
-
 static int valkyriefb_switch(int con, struct fb_info *fb)
 {
 	struct fb_info_valkyrie *info = (struct fb_info_valkyrie *) fb;
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index e4ee03a82..fa19c744d 100644
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
@@ -438,13 +438,6 @@ static int vesafb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 	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 @@ static struct fb_ops vesafb_ops = {
 	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)
diff --git a/drivers/video/vfb.c b/drivers/video/vfb.c
index 0d00b6f4a..c51d33bed 100644
--- a/drivers/video/vfb.c
+++ b/drivers/video/vfb.c
@@ -92,8 +92,6 @@ static int vfb_get_cmap(struct fb_cmap *cmap, int kspc, int con,
 			struct fb_info *info);
 static int vfb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 			struct fb_info *info);
-static int vfb_ioctl(struct inode *inode, struct file *file, u_int cmd,
-		     u_long arg, int con, struct fb_info *info);
 
 
     /*
@@ -129,7 +127,6 @@ static struct fb_ops vfb_ops = {
 	fb_get_cmap:	vfb_get_cmap,
 	fb_set_cmap:	vfb_set_cmap,
 	fb_pan_display:	vfb_pan_display,
-	fb_ioctl:	vfb_ioctl,
 };
 
     /*
@@ -377,17 +374,6 @@ static int vfb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 }
 
 
-    /*
-     *  Virtual Frame Buffer Specific ioctls
-     */
-
-static int vfb_ioctl(struct inode *inode, struct file *file, u_int cmd,
-		     u_long arg, int con, struct fb_info *info)
-{
-    return -EINVAL;
-}
-
-
 int __init vfb_setup(char *options)
 {
     char *this_opt;
diff --git a/drivers/video/vga16fb.c b/drivers/video/vga16fb.c
index f6cb655e1..35197da60 100644
--- a/drivers/video/vga16fb.c
+++ b/drivers/video/vga16fb.c
@@ -673,13 +673,6 @@ static int vga16fb_pan_display(struct fb_var_screeninfo *var, int con,
 	return 0;
 }
 
-static int vga16fb_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 vga16fb_ops = {
 	owner:		THIS_MODULE,
 	fb_get_fix:	vga16fb_get_fix,
@@ -688,7 +681,6 @@ static struct fb_ops vga16fb_ops = {
 	fb_get_cmap:	vga16fb_get_cmap,
 	fb_set_cmap:	vga16fb_set_cmap,
 	fb_pan_display:	vga16fb_pan_display,
-	fb_ioctl:	vga16fb_ioctl,
 };
 
 int vga16fb_setup(char *options)
diff --git a/drivers/video/virgefb.c b/drivers/video/virgefb.c
index 7441b7fdc..6be952607 100644
--- a/drivers/video/virgefb.c
+++ b/drivers/video/virgefb.c
@@ -308,10 +308,6 @@ static int virgefb_get_cmap(struct fb_cmap *cmap, int kspc, int con,
 			    struct fb_info *info);
 static int virgefb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 			    struct fb_info *info);
-static int virgefb_pan_display(struct fb_var_screeninfo *var, int con,
-			       struct fb_info *info);
-static int virgefb_ioctl(struct inode *inode, struct file *file, u_int cmd,
-                         u_long arg, int con, struct fb_info *info);
 
 
 /*
@@ -1072,30 +1068,6 @@ static int virgefb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 }
 
 
-/*
- *    Pan or Wrap the Display
- *
- *    This call looks only at xoffset, yoffset and the FB_VMODE_YWRAP flag
- */
-
-static int virgefb_pan_display(struct fb_var_screeninfo *var, int con,
-			       struct fb_info *info)
-{
-	return(-EINVAL);
-}
-
-
-/*
- *	 Cybervision Frame Buffer Specific ioctls
- */
-
-static int virgefb_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 virgefb_ops = {
 	owner:		THIS_MODULE,
 	fb_get_fix:	virgefb_get_fix,
@@ -1103,8 +1075,6 @@ static struct fb_ops virgefb_ops = {
 	fb_set_var:	virgefb_set_var,
 	fb_get_cmap:	virgefb_get_cmap,
 	fb_set_cmap:	virgefb_set_cmap,
-	fb_pan_display:	virgefb_pan_display,
-	fb_ioctl:	virgefb_ioctl,
 };