projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for_paulus' of git://git.kernel.org/pub/scm/linux/kernel/git/galak...
[powerpc.git]
/
drivers
/
char
/
lcd.c
diff --git
a/drivers/char/lcd.c
b/drivers/char/lcd.c
index
b771611
..
29963d8
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;