diff options
Diffstat (limited to 'drivers/video/cg14.c')
-rw-r--r-- | drivers/video/cg14.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c index a56147102abb..edb9936673c8 100644 --- a/drivers/video/cg14.c +++ b/drivers/video/cg14.c | |||
@@ -32,8 +32,7 @@ static int cg14_setcolreg(unsigned, unsigned, unsigned, unsigned, | |||
32 | unsigned, struct fb_info *); | 32 | unsigned, struct fb_info *); |
33 | 33 | ||
34 | static int cg14_mmap(struct fb_info *, struct file *, struct vm_area_struct *); | 34 | static int cg14_mmap(struct fb_info *, struct file *, struct vm_area_struct *); |
35 | static int cg14_ioctl(struct inode *, struct file *, unsigned int, | 35 | static int cg14_ioctl(struct fb_info *, unsigned int, unsigned long); |
36 | unsigned long, struct fb_info *); | ||
37 | static int cg14_pan_display(struct fb_var_screeninfo *, struct fb_info *); | 36 | static int cg14_pan_display(struct fb_var_screeninfo *, struct fb_info *); |
38 | 37 | ||
39 | /* | 38 | /* |
@@ -277,8 +276,7 @@ static int cg14_mmap(struct fb_info *info, struct file *file, struct vm_area_str | |||
277 | par->iospace, vma); | 276 | par->iospace, vma); |
278 | } | 277 | } |
279 | 278 | ||
280 | static int cg14_ioctl(struct inode *inode, struct file *file, unsigned int cmd, | 279 | static int cg14_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) |
281 | unsigned long arg, struct fb_info *info) | ||
282 | { | 280 | { |
283 | struct cg14_par *par = (struct cg14_par *) info->par; | 281 | struct cg14_par *par = (struct cg14_par *) info->par; |
284 | struct cg14_regs __iomem *regs = par->regs; | 282 | struct cg14_regs __iomem *regs = par->regs; |