commit c4ed38a0c6e2e5c4906296758f816ee71373792f
author Ralf Baechle <ralf@linux-mips.org> Mon Feb 21 16:18:36 2005 +0000
committer Ralf Baechle <ralf@linux-mips.org> Sat Oct 29 19:30:42 2005 +0100
tree 65ebab9ca61ea6d03109c53acd2989b626dce52a
parent 049b13c358f0187cf3c5003d5fb9848dbcb28bc3

Resurrect Cobalt support for 2.6.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

drivers/char/lcd.c

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 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;
 

drivers/char/lcd.h

diff --git a/drivers/char/lcd.h b/drivers/char/lcd.h
index 878a952..a8d4ae7 100644
--- a/drivers/char/lcd.h
+++ b/drivers/char/lcd.h
@@ -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];