summaryrefslogtreecommitdiffstats
path: root/drivers/video/retz3fb.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-07-28 22:58:42 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-07-28 22:58:42 +0000
commiteed6b7c84cc33f229f6fecd884d9a22af5bec514 (patch)
tree422a7a49328c59053f4fb11805adb753523c2f2c /drivers/video/retz3fb.c
parenta3b90e3c6976551acbac09f5aacd736a1658aaa8 (diff)
Merge with Linux 2.4.0-test5-pre6.
Diffstat (limited to 'drivers/video/retz3fb.c')
-rw-r--r--drivers/video/retz3fb.c32
1 files changed, 0 insertions, 32 deletions
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,
};