X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=drivers%2Fchar%2Flcd.c;h=da601fd6c07ae24424350dc77541fb695c9ad15c;hb=b517bea1c74e4773482b3f41b3f493522a8c8e30;hp=b771611461445548bed26bd09df0c06fe2265587;hpb=dbaa9a9d2b37d838125fb7f2b9fdc5dc5fa4eaa9;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/char/lcd.c b/drivers/char/lcd.c
index b7716114614..da601fd6c07 100644
--- a/drivers/char/lcd.c
+++ b/drivers/char/lcd.c
@@ -14,7 +14,6 @@
 
 #define RTC_IO_EXTENT	0x10	/*Only really two ports, but... */
 
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/miscdevice.h>
@@ -575,8 +574,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;
 
@@ -599,7 +598,7 @@ static long lcd_read(struct inode *inode, struct file *file, char *buf,
  *	The various file operations we support.
  */
 
-static struct file_operations lcd_fops = {
+static const struct file_operations lcd_fops = {
 	.read = lcd_read,
 	.ioctl = lcd_ioctl,
 	.open = lcd_open,