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/vc_screen.c | |
| parent | c02e0599c4233f97071928f8118841954bacdadf (diff) | |
Merge with 2.1.56 as first part of merging back my code.
Diffstat (limited to 'drivers/char/vc_screen.c')
| -rw-r--r-- | drivers/char/vc_screen.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/char/vc_screen.c b/drivers/char/vc_screen.c index c0d7440c3..9d2ecda3a 100644 --- a/drivers/char/vc_screen.c +++ b/drivers/char/vc_screen.c @@ -79,11 +79,10 @@ vcs_size(struct inode *inode) return size; } -static long long -vcs_lseek(struct inode *inode, struct file *file, long long offset, int orig) +static long long vcs_lseek(struct file *file, long long offset, int orig) { int size; - size = vcs_size(inode); + size = vcs_size(file->f_dentry->d_inode); switch (orig) { case 0: |