Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

[linux-drm-fsl-dcu.git] / drivers / char / lcd.c

diff --git a/drivers/char/lcd.c b/drivers/char/lcd.c
index b771611461445548bed26bd09df0c06fe2265587..29963d8be6674abdcd92fe7c9485f978c4c58c76 100644 (file)
--- 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;