diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 05:02:45 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 05:02:45 -0400 |
| commit | e27772b48df91a954a74b1411b57d83b945a58c7 (patch) | |
| tree | ebd4a434d9e3cbd0844109e4469f91daac581b59 /drivers/net/slip.c | |
| parent | d092633bff3b19faffc480fe9810805e7792a029 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'drivers/net/slip.c')
| -rw-r--r-- | drivers/net/slip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/slip.c b/drivers/net/slip.c index 84af68fdb6c2..1d58991d395b 100644 --- a/drivers/net/slip.c +++ b/drivers/net/slip.c | |||
| @@ -1301,7 +1301,7 @@ static int sl_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) | |||
| 1301 | #endif | 1301 | #endif |
| 1302 | /* VSV changes end */ | 1302 | /* VSV changes end */ |
| 1303 | 1303 | ||
| 1304 | static struct tty_ldisc sl_ldisc = { | 1304 | static struct tty_ldisc_ops sl_ldisc = { |
| 1305 | .owner = THIS_MODULE, | 1305 | .owner = THIS_MODULE, |
| 1306 | .magic = TTY_LDISC_MAGIC, | 1306 | .magic = TTY_LDISC_MAGIC, |
| 1307 | .name = "slip", | 1307 | .name = "slip", |