projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'tty-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
[linux-2.6-microblaze.git]
/
drivers
/
net
/
ppp
/
ppp_async.c
diff --git
a/drivers/net/ppp/ppp_async.c
b/drivers/net/ppp/ppp_async.c
index
2b66cf3
..
2a91caa
100644
(file)
--- a/
drivers/net/ppp/ppp_async.c
+++ b/
drivers/net/ppp/ppp_async.c
@@
-259,7
+259,8
@@
static int ppp_asynctty_hangup(struct tty_struct *tty)
*/
static ssize_t
ppp_asynctty_read(struct tty_struct *tty, struct file *file,
- unsigned char __user *buf, size_t count)
+ unsigned char *buf, size_t count,
+ void **cookie, unsigned long offset)
{
return -EAGAIN;
}