diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-28 22:58:42 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-28 22:58:42 +0000 |
| commit | eed6b7c84cc33f229f6fecd884d9a22af5bec514 (patch) | |
| tree | 422a7a49328c59053f4fb11805adb753523c2f2c /drivers/video/fm2fb.c | |
| parent | a3b90e3c6976551acbac09f5aacd736a1658aaa8 (diff) | |
Merge with Linux 2.4.0-test5-pre6.
Diffstat (limited to 'drivers/video/fm2fb.c')
| -rw-r--r-- | drivers/video/fm2fb.c | 28 |
1 files changed, 0 insertions, 28 deletions
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 */ |