diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2005-02-21 16:18:36 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2005-10-29 19:30:42 +0100 |
| commit | c4ed38a0c6e2e5c4906296758f816ee71373792f (patch) | |
| tree | 65ebab9ca61ea6d03109c53acd2989b626dce52a /drivers | |
| parent | 049b13c358f0187cf3c5003d5fb9848dbcb28bc3 (diff) | |
Resurrect Cobalt support for 2.6.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/lcd.c | 4 | ||||
| -rw-r--r-- | drivers/char/lcd.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/lcd.c b/drivers/char/lcd.c index b77161146144..29963d8be667 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; diff --git a/drivers/char/lcd.h b/drivers/char/lcd.h index 878a95280e87..a8d4ae737158 100644 --- a/drivers/char/lcd.h +++ b/drivers/char/lcd.h @@ -22,7 +22,7 @@ static int timeout(volatile unsigned long); #define MAX_IDLE_TIME 120 struct lcd_display { - unsigned long buttons; + unsigned buttons; int size1; int size2; unsigned char line1[LCD_CHARS_PER_LINE]; |