diff options
Diffstat (limited to 'drivers/video/cg3.c')
-rw-r--r-- | drivers/video/cg3.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c index 9fcd89608ed7..3de6e1b5ab2f 100644 --- a/drivers/video/cg3.c +++ b/drivers/video/cg3.c | |||
@@ -33,9 +33,8 @@ static int cg3_setcolreg(unsigned, unsigned, unsigned, unsigned, | |||
33 | unsigned, struct fb_info *); | 33 | unsigned, struct fb_info *); |
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 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 |
@@ -230,7 +229,7 @@ static struct sbus_mmap_map cg3_mmap_map[] = { | |||
230 | { .size = 0 } | 229 | { .size = 0 } |
231 | }; | 230 | }; |
232 | 231 | ||
233 | static int cg3_mmap(struct fb_info *info, struct file *file, struct vm_area_struct *vma) | 232 | static int cg3_mmap(struct fb_info *info, struct vm_area_struct *vma) |
234 | { | 233 | { |
235 | struct cg3_par *par = (struct cg3_par *)info->par; | 234 | struct cg3_par *par = (struct cg3_par *)info->par; |
236 | 235 | ||
@@ -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 | ||