diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-01-18 04:49:59 +0100 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-01-18 04:49:59 +0100 |
| commit | d65177c1ae7f085723154105c5dc8d9e16ae8265 (patch) | |
| tree | 14408129d880d89cc5e937f2810f243ed1e6fcde /drivers/video/gbefb.c | |
| parent | [CIFS] Remove compiler warning (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | linux-d65177c1ae7f085723154105c5dc8d9e16ae8265.tar.xz linux-d65177c1ae7f085723154105c5dc8d9e16ae8265.zip | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'drivers/video/gbefb.c')
| -rw-r--r-- | drivers/video/gbefb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/gbefb.c b/drivers/video/gbefb.c index d744c51807b7..38d22729b129 100644 --- a/drivers/video/gbefb.c +++ b/drivers/video/gbefb.c @@ -979,7 +979,7 @@ static int gbefb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) return 0; } -static int gbefb_mmap(struct fb_info *info, struct file *file, +static int gbefb_mmap(struct fb_info *info, struct vm_area_struct *vma) { unsigned long size = vma->vm_end - vma->vm_start; @@ -1000,7 +1000,6 @@ static int gbefb_mmap(struct fb_info *info, struct file *file, pgprot_fb(pgprot_val(vma->vm_page_prot)); vma->vm_flags |= VM_IO | VM_RESERVED; - vma->vm_file = file; /* look for the starting tile */ tile = &gbe_tiles.cpu[offset >> TILE_SHIFT]; |