Merge with Linux 2.4.0-test5-pre6.

1 files changed, 1 insertions, 13 deletions

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,
 };