Subject: [PATCH 2.6] Cobalt fixes [3 of 6]

From: Peter Horton <[email-masked]>
Date: Sun, 20 Feb 2005 14:57:46 +0000

Fix Cobalt LCD driver for 2.6.

P.

--- linux-cvs/drivers/char/lcd.c	2005-01-25 04:28:12.000000000 +0000
+++ linux-wip/drivers/char/lcd.c	2005-02-20 13:48:22.000000000 +0000
@@ -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;
 
--- linux-cvs/drivers/char/lcd.h	2005-01-13 14:05:52.000000000 +0000
+++ linux-wip/drivers/char/lcd.h	2005-02-20 13:48:22.000000000 +0000
@@ -22,7 +22,7 @@ static int timeout(volatile unsigned lon
 #define MAX_IDLE_TIME 120
 
 struct lcd_display {
-        unsigned long buttons;
+        unsigned buttons;
         int size1;
         int size2;
         unsigned char line1[LCD_CHARS_PER_LINE];