diff options
Diffstat (limited to 'drivers/video/aty/atyfb_base.c')
-rw-r--r-- | drivers/video/aty/atyfb_base.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index ed81005cbdba..485be386a8ff 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c | |||
@@ -238,13 +238,12 @@ static int atyfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, | |||
238 | u_int transp, struct fb_info *info); | 238 | u_int transp, struct fb_info *info); |
239 | static int atyfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info); | 239 | static int atyfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info); |
240 | static int atyfb_blank(int blank, struct fb_info *info); | 240 | static int atyfb_blank(int blank, struct fb_info *info); |
241 | static int atyfb_ioctl(struct inode *inode, struct file *file, u_int cmd, | 241 | static int atyfb_ioctl(struct fb_info *info, u_int cmd, u_long arg); |
242 | u_long arg, struct fb_info *info); | ||
243 | extern void atyfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect); | 242 | extern void atyfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect); |
244 | extern void atyfb_copyarea(struct fb_info *info, const struct fb_copyarea *area); | 243 | extern void atyfb_copyarea(struct fb_info *info, const struct fb_copyarea *area); |
245 | extern void atyfb_imageblit(struct fb_info *info, const struct fb_image *image); | 244 | extern void atyfb_imageblit(struct fb_info *info, const struct fb_image *image); |
246 | #ifdef __sparc__ | 245 | #ifdef __sparc__ |
247 | static int atyfb_mmap(struct fb_info *info, struct file *file, struct vm_area_struct *vma); | 246 | static int atyfb_mmap(struct fb_info *info, struct vm_area_struct *vma); |
248 | #endif | 247 | #endif |
249 | static int atyfb_sync(struct fb_info *info); | 248 | static int atyfb_sync(struct fb_info *info); |
250 | 249 | ||
@@ -1739,8 +1738,7 @@ struct atyclk { | |||
1739 | #define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32) | 1738 | #define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32) |
1740 | #endif | 1739 | #endif |
1741 | 1740 | ||
1742 | static int atyfb_ioctl(struct inode *inode, struct file *file, u_int cmd, | 1741 | static int atyfb_ioctl(struct fb_info *info, u_int cmd, u_long arg) |
1743 | u_long arg, struct fb_info *info) | ||
1744 | { | 1742 | { |
1745 | struct atyfb_par *par = (struct atyfb_par *) info->par; | 1743 | struct atyfb_par *par = (struct atyfb_par *) info->par; |
1746 | #ifdef __sparc__ | 1744 | #ifdef __sparc__ |
@@ -1845,7 +1843,7 @@ static int atyfb_sync(struct fb_info *info) | |||
1845 | } | 1843 | } |
1846 | 1844 | ||
1847 | #ifdef __sparc__ | 1845 | #ifdef __sparc__ |
1848 | static int atyfb_mmap(struct fb_info *info, struct file *file, struct vm_area_struct *vma) | 1846 | static int atyfb_mmap(struct fb_info *info, struct vm_area_struct *vma) |
1849 | { | 1847 | { |
1850 | struct atyfb_par *par = (struct atyfb_par *) info->par; | 1848 | struct atyfb_par *par = (struct atyfb_par *) info->par; |
1851 | unsigned int size, page, map_size = 0; | 1849 | unsigned int size, page, map_size = 0; |