diff options
author | Christoph Hellwig <hch@lst.de> | 2006-01-14 16:21:25 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 21:27:15 -0500 |
commit | 216d526c89d144928f095f2800bc6c67e968d628 (patch) | |
tree | 2363b4c9ab1e4f7acea503427fa6a21e5fa3dbe8 /drivers/video/cg3.c | |
parent | 67a6680d64e18c7a1901f31ef747ea53b6cd986d (diff) |
[PATCH] fbdev: Sanitize ->fb_mmap prototype
No need for a file argument. If we'd really need it it's in vma->vm_file
already. gbefb and sgivwfb used to set vma->vm_file to the file argument, but
the kernel alrady did that.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/cg3.c')
-rw-r--r-- | drivers/video/cg3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c index 027f707fa5db..3de6e1b5ab2f 100644 --- a/drivers/video/cg3.c +++ b/drivers/video/cg3.c | |||
@@ -33,7 +33,7 @@ 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 fb_info *, unsigned int, unsigned long); | 37 | static int cg3_ioctl(struct fb_info *, unsigned int, unsigned long); |
38 | 38 | ||
39 | /* | 39 | /* |
@@ -229,7 +229,7 @@ static struct sbus_mmap_map cg3_mmap_map[] = { | |||
229 | { .size = 0 } | 229 | { .size = 0 } |
230 | }; | 230 | }; |
231 | 231 | ||
232 | 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) |
233 | { | 233 | { |
234 | struct cg3_par *par = (struct cg3_par *)info->par; | 234 | struct cg3_par *par = (struct cg3_par *)info->par; |
235 | 235 | ||