diff options
Diffstat (limited to 'drivers/video/bw2.c')
| -rw-r--r-- | drivers/video/bw2.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c index 9248fe1fbb1a..c029db4646f6 100644 --- a/drivers/video/bw2.c +++ b/drivers/video/bw2.c | |||
| @@ -35,9 +35,8 @@ | |||
| 35 | 35 | ||
| 36 | static int bw2_blank(int, struct fb_info *); | 36 | static int bw2_blank(int, struct fb_info *); |
| 37 | 37 | ||
| 38 | static int bw2_mmap(struct fb_info *, struct file *, struct vm_area_struct *); | 38 | static int bw2_mmap(struct fb_info *, struct vm_area_struct *); |
| 39 | static int bw2_ioctl(struct inode *, struct file *, unsigned int, | 39 | static int bw2_ioctl(struct fb_info *, unsigned int, unsigned long); |
| 40 | unsigned long, struct fb_info *); | ||
| 41 | 40 | ||
| 42 | /* | 41 | /* |
| 43 | * Frame buffer operations | 42 | * Frame buffer operations |
| @@ -169,7 +168,7 @@ static struct sbus_mmap_map bw2_mmap_map[] = { | |||
| 169 | { .size = 0 } | 168 | { .size = 0 } |
| 170 | }; | 169 | }; |
| 171 | 170 | ||
| 172 | static int bw2_mmap(struct fb_info *info, struct file *file, struct vm_area_struct *vma) | 171 | static int bw2_mmap(struct fb_info *info, struct vm_area_struct *vma) |
| 173 | { | 172 | { |
| 174 | struct bw2_par *par = (struct bw2_par *)info->par; | 173 | struct bw2_par *par = (struct bw2_par *)info->par; |
| 175 | 174 | ||
| @@ -181,8 +180,7 @@ static int bw2_mmap(struct fb_info *info, struct file *file, struct vm_area_stru | |||
| 181 | vma); | 180 | vma); |
| 182 | } | 181 | } |
| 183 | 182 | ||
| 184 | static int bw2_ioctl(struct inode *inode, struct file *file, unsigned int cmd, | 183 | static int bw2_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) |
| 185 | unsigned long arg, struct fb_info *info) | ||
| 186 | { | 184 | { |
| 187 | struct bw2_par *par = (struct bw2_par *) info->par; | 185 | struct bw2_par *par = (struct bw2_par *) info->par; |
| 188 | 186 | ||
