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/g364fb.c | |
parent | a3b90e3c6976551acbac09f5aacd736a1658aaa8 (diff) |
Merge with Linux 2.4.0-test5-pre6.
Diffstat (limited to 'drivers/video/g364fb.c')
-rw-r--r-- | drivers/video/g364fb.c | 10 |
1 files changed, 0 insertions, 10 deletions
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 */ |