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