summaryrefslogtreecommitdiffstats
path: root/drivers/char/lp_m68k.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1997-12-01 04:02:08 +0000
committerRalf Baechle <ralf@linux-mips.org>1997-12-01 04:02:08 +0000
commitfd095d09f2d475dc2e8599b1b8bae1cd65e91685 (patch)
tree217f87a997699505e0dd752931409b9f10fffe65 /drivers/char/lp_m68k.c
parentc02e0599c4233f97071928f8118841954bacdadf (diff)
Merge with 2.1.56 as first part of merging back my code.
Diffstat (limited to 'drivers/char/lp_m68k.c')
-rw-r--r--drivers/char/lp_m68k.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/lp_m68k.c b/drivers/char/lp_m68k.c
index 117dc3fe7..bdb3405ca 100644
--- a/drivers/char/lp_m68k.c
+++ b/drivers/char/lp_m68k.c
@@ -353,8 +353,7 @@ static long lp_write(struct inode *inode, struct file *file,
}
#endif
-static long long lp_lseek(struct inode * inode, struct file * file,
- long long offset, int origin)
+static long long lp_lseek(struct file * file, long long offset, int origin)
{
return -ESPIPE;
}