diff options
Diffstat (limited to 'drivers/video/tcx.c')
| -rw-r--r-- | drivers/video/tcx.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/video/tcx.c b/drivers/video/tcx.c index 2b27b4474001..cb940771ec58 100644 --- a/drivers/video/tcx.c +++ b/drivers/video/tcx.c | |||
| @@ -34,8 +34,7 @@ static int tcx_setcolreg(unsigned, unsigned, unsigned, unsigned, | |||
| 34 | static int tcx_blank(int, struct fb_info *); | 34 | static int tcx_blank(int, struct fb_info *); |
| 35 | 35 | ||
| 36 | static int tcx_mmap(struct fb_info *, struct file *, struct vm_area_struct *); | 36 | static int tcx_mmap(struct fb_info *, struct file *, struct vm_area_struct *); |
| 37 | static int tcx_ioctl(struct inode *, struct file *, unsigned int, | 37 | static int tcx_ioctl(struct fb_info *, unsigned int, unsigned long); |
| 38 | unsigned long, struct fb_info *); | ||
| 39 | static int tcx_pan_display(struct fb_var_screeninfo *, struct fb_info *); | 38 | static int tcx_pan_display(struct fb_var_screeninfo *, struct fb_info *); |
| 40 | 39 | ||
| 41 | /* | 40 | /* |
| @@ -312,8 +311,8 @@ static int tcx_mmap(struct fb_info *info, struct file *file, struct vm_area_stru | |||
| 312 | vma); | 311 | vma); |
| 313 | } | 312 | } |
| 314 | 313 | ||
| 315 | static int tcx_ioctl(struct inode *inode, struct file *file, unsigned int cmd, | 314 | static int tcx_ioctl(struct fb_info *info, unsigned int cmd, |
| 316 | unsigned long arg, struct fb_info *info) | 315 | unsigned long arg) |
| 317 | { | 316 | { |
| 318 | struct tcx_par *par = (struct tcx_par *) info->par; | 317 | struct tcx_par *par = (struct tcx_par *) info->par; |
| 319 | 318 | ||
