diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-01-15 23:59:29 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-01-15 23:59:29 +0100 |
| commit | f1dccedc8148026d9071c6805f7cb77374a9e56f (patch) | |
| tree | ba4a630084b8d21309930321ff53a6ed4381c0f3 /drivers/video/sgivwfb.c | |
| parent | V4L/DVB (3364): disable all dvb tuner param_types until we need them (diff) | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| download | linux-f1dccedc8148026d9071c6805f7cb77374a9e56f.tar.xz linux-f1dccedc8148026d9071c6805f7cb77374a9e56f.zip | |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/video/sgivwfb.c')
| -rw-r--r-- | drivers/video/sgivwfb.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/video/sgivwfb.c b/drivers/video/sgivwfb.c index 7054660767e4..2e6df1fcb2b9 100644 --- a/drivers/video/sgivwfb.c +++ b/drivers/video/sgivwfb.c @@ -115,7 +115,7 @@ static int sgivwfb_set_par(struct fb_info *info); static int sgivwfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, u_int transp, struct fb_info *info); -static int sgivwfb_mmap(struct fb_info *info, struct file *file, +static int sgivwfb_mmap(struct fb_info *info, struct vm_area_struct *vma); static struct fb_ops sgivwfb_ops = { @@ -706,7 +706,7 @@ static int sgivwfb_setcolreg(u_int regno, u_int red, u_int green, return 0; } -static int sgivwfb_mmap(struct fb_info *info, struct file *file, +static int sgivwfb_mmap(struct fb_info *info, struct vm_area_struct *vma) { unsigned long size = vma->vm_end - vma->vm_start; @@ -723,7 +723,6 @@ static int sgivwfb_mmap(struct fb_info *info, struct file *file, if (remap_pfn_range(vma, vma->vm_start, offset >> PAGE_SHIFT, size, vma->vm_page_prot)) return -EAGAIN; - vma->vm_file = file; printk(KERN_DEBUG "sgivwfb: mmap framebuffer P(%lx)->V(%lx)\n", offset, vma->vm_start); return 0; |