CVS Update@linux-mips.org: linux

[ralf@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ralf@ftp.linux-mips.org 05/02/21 16:31:53

Modified files:
        drivers/char   : lcd.c lcd.h 

Log message:
        Fix Cobalt LCD driver for 2.6.

diff -urN linux/drivers/char/lcd.c linux/drivers/char/lcd.c
--- linux/drivers/char/lcd.c    2005/01/25 04:28:12     1.11
+++ linux/drivers/char/lcd.c    2005/02/21 16:31:53     1.12
@@ -575,8 +575,8 @@
 
 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 -urN linux/drivers/char/lcd.h linux/drivers/char/lcd.h
--- linux/drivers/char/lcd.h    2005/01/13 14:05:52     1.6
+++ linux/drivers/char/lcd.h    2005/02/21 16:31:53     1.7
@@ -22,7 +22,7 @@
 #define MAX_IDLE_TIME 120
 
 struct lcd_display {
-        unsigned long buttons;
+        unsigned buttons;
         int size1;
         int size2;
         unsigned char line1[LCD_CHARS_PER_LINE];