diff options
| author | Christoph Hellwig <hch@lst.de> | 2006-01-14 13:21:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 18:27:15 -0800 |
| commit | 216d526c89d144928f095f2800bc6c67e968d628 (patch) | |
| tree | 2363b4c9ab1e4f7acea503427fa6a21e5fa3dbe8 /drivers/video/controlfb.c | |
| parent | 67a6680d64e18c7a1901f31ef747ea53b6cd986d (diff) | |
| download | linux-216d526c89d144928f095f2800bc6c67e968d628.tar.gz linux-216d526c89d144928f095f2800bc6c67e968d628.tar.bz2 linux-216d526c89d144928f095f2800bc6c67e968d628.zip | |
[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/controlfb.c')
| -rw-r--r-- | drivers/video/controlfb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/controlfb.c b/drivers/video/controlfb.c index 03798e9c882d..655301a8671c 100644 --- a/drivers/video/controlfb.c +++ b/drivers/video/controlfb.c @@ -128,7 +128,7 @@ static int controlfb_pan_display(struct fb_var_screeninfo *var, static int controlfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, u_int transp, struct fb_info *info); static int controlfb_blank(int blank_mode, struct fb_info *info); -static int controlfb_mmap(struct fb_info *info, struct file *file, +static int controlfb_mmap(struct fb_info *info, struct vm_area_struct *vma); static int controlfb_set_par (struct fb_info *info); static int controlfb_check_var (struct fb_var_screeninfo *var, struct fb_info *info); @@ -280,7 +280,7 @@ static int controlfb_pan_display(struct fb_var_screeninfo *var, * for controlfb. * Note there's no locking in here; it's done in fb_mmap() in fbmem.c. */ -static int controlfb_mmap(struct fb_info *info, struct file *file, +static int controlfb_mmap(struct fb_info *info, struct vm_area_struct *vma) { unsigned long off, start; |