diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 19:19:15 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 19:19:15 (GMT) |
| commit | e9d52234e35b27ea4ea5f2ab64ca47b1a0c740ab (patch) | |
| tree | 318d37a7d55c79e6f7d86163fb28e0eccbb0fe83 /drivers/char/lcd.c | |
| parent | 955c5038823748e529a49f0e33ab635d92843500 (diff) | |
| parent | 09af7b443c257460d45cb6c1896d29f173fef35b (diff) | |
| download | linux-e9d52234e35b27ea4ea5f2ab64ca47b1a0c740ab.tar.xz | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Diffstat (limited to 'drivers/char/lcd.c')
| -rw-r--r-- | drivers/char/lcd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/lcd.c b/drivers/char/lcd.c index b771611..29963d8 100644 --- a/drivers/char/lcd.c +++ b/drivers/char/lcd.c @@ -575,8 +575,8 @@ static inline int button_pressed(void) static int lcd_waiters = 0; -static long lcd_read(struct inode *inode, struct file *file, char *buf, - unsigned long count) +static ssize_t lcd_read(struct file *file, char *buf, + size_t count, loff_t *ofs) { long buttons_now; |