diff options
Diffstat (limited to 'drivers/video/cg3.c')
| -rw-r--r-- | drivers/video/cg3.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c index 9fcd89608ed7..027f707fa5db 100644 --- a/drivers/video/cg3.c +++ b/drivers/video/cg3.c | |||
| @@ -34,8 +34,7 @@ static int cg3_setcolreg(unsigned, unsigned, unsigned, unsigned, | |||
| 34 | static int cg3_blank(int, struct fb_info *); | 34 | static int cg3_blank(int, struct fb_info *); |
| 35 | 35 | ||
| 36 | static int cg3_mmap(struct fb_info *, struct file *, struct vm_area_struct *); | 36 | static int cg3_mmap(struct fb_info *, struct file *, struct vm_area_struct *); |
| 37 | static int cg3_ioctl(struct inode *, struct file *, unsigned int, | 37 | static int cg3_ioctl(struct fb_info *, unsigned int, unsigned long); |
| 38 | unsigned long, struct fb_info *); | ||
| 39 | 38 | ||
| 40 | /* | 39 | /* |
| 41 | * Frame buffer operations | 40 | * Frame buffer operations |
| @@ -240,8 +239,7 @@ static int cg3_mmap(struct fb_info *info, struct file *file, struct vm_area_stru | |||
| 240 | vma); | 239 | vma); |
| 241 | } | 240 | } |
| 242 | 241 | ||
| 243 | static int cg3_ioctl(struct inode *inode, struct file *file, unsigned int cmd, | 242 | static int cg3_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) |
| 244 | unsigned long arg, struct fb_info *info) | ||
| 245 | { | 243 | { |
| 246 | struct cg3_par *par = (struct cg3_par *) info->par; | 244 | struct cg3_par *par = (struct cg3_par *) info->par; |
| 247 | 245 | ||