diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-01 04:02:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-01 04:02:08 +0000 |
| commit | fd095d09f2d475dc2e8599b1b8bae1cd65e91685 (patch) | |
| tree | 217f87a997699505e0dd752931409b9f10fffe65 /drivers/char/fbmem.c | |
| parent | c02e0599c4233f97071928f8118841954bacdadf (diff) | |
Merge with 2.1.56 as first part of merging back my code.
Diffstat (limited to 'drivers/char/fbmem.c')
| -rw-r--r-- | drivers/char/fbmem.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/char/fbmem.c b/drivers/char/fbmem.c index 4a5bea195..d475413b3 100644 --- a/drivers/char/fbmem.c +++ b/drivers/char/fbmem.c @@ -199,10 +199,9 @@ fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd, } } -static int -fb_mmap(struct inode *inode, struct file *file, struct vm_area_struct * vma) +static int fb_mmap(struct file *file, struct vm_area_struct * vma) { - struct fb_ops *fb = registered_fb[GET_FB_IDX(inode->i_rdev)]; + struct fb_ops *fb = registered_fb[GET_FB_IDX(file->f_dentry->d_inode->i_rdev)]; struct fb_fix_screeninfo fix; if (! fb) |