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/cg6.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/cg6.c')
-rw-r--r-- | drivers/video/cg6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c index 678e335d2b0f..7aab91ead681 100644 --- a/drivers/video/cg6.c +++ b/drivers/video/cg6.c | |||
@@ -36,7 +36,7 @@ static int cg6_blank(int, struct fb_info *); | |||
36 | static void cg6_imageblit(struct fb_info *, const struct fb_image *); | 36 | static void cg6_imageblit(struct fb_info *, const struct fb_image *); |
37 | static void cg6_fillrect(struct fb_info *, const struct fb_fillrect *); | 37 | static void cg6_fillrect(struct fb_info *, const struct fb_fillrect *); |
38 | static int cg6_sync(struct fb_info *); | 38 | static int cg6_sync(struct fb_info *); |
39 | static int cg6_mmap(struct fb_info *, struct file *, struct vm_area_struct *); | 39 | static int cg6_mmap(struct fb_info *, struct vm_area_struct *); |
40 | static int cg6_ioctl(struct fb_info *, unsigned int, unsigned long); | 40 | static int cg6_ioctl(struct fb_info *, unsigned int, unsigned long); |
41 | 41 | ||
42 | /* | 42 | /* |
@@ -523,7 +523,7 @@ static struct sbus_mmap_map cg6_mmap_map[] = { | |||
523 | { .size = 0 } | 523 | { .size = 0 } |
524 | }; | 524 | }; |
525 | 525 | ||
526 | static int cg6_mmap(struct fb_info *info, struct file *file, struct vm_area_struct *vma) | 526 | static int cg6_mmap(struct fb_info *info, struct vm_area_struct *vma) |
527 | { | 527 | { |
528 | struct cg6_par *par = (struct cg6_par *)info->par; | 528 | struct cg6_par *par = (struct cg6_par *)info->par; |
529 | 529 | ||