diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 09:06:09 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 09:06:09 -0400 |
| commit | e66d90fb4abd0a27ee96f57a32fb561221c4d6ae (patch) | |
| tree | 3337cba94c7444b06fdb0e8b487287d07b71f4a0 /drivers/net/ppp_async.c | |
| parent | 55ca089e2579de90f048aca2a3030b8b2f864813 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
Merge branch 'linus' into xen-64bit
Diffstat (limited to 'drivers/net/ppp_async.c')
| -rw-r--r-- | drivers/net/ppp_async.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ppp_async.c b/drivers/net/ppp_async.c index f1a52def1241..451bdb57d6fc 100644 --- a/drivers/net/ppp_async.c +++ b/drivers/net/ppp_async.c | |||
| @@ -378,7 +378,7 @@ ppp_asynctty_wakeup(struct tty_struct *tty) | |||
| 378 | } | 378 | } |
| 379 | 379 | ||
| 380 | 380 | ||
| 381 | static struct tty_ldisc ppp_ldisc = { | 381 | static struct tty_ldisc_ops ppp_ldisc = { |
| 382 | .owner = THIS_MODULE, | 382 | .owner = THIS_MODULE, |
| 383 | .magic = TTY_LDISC_MAGIC, | 383 | .magic = TTY_LDISC_MAGIC, |
| 384 | .name = "ppp", | 384 | .name = "ppp", |