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/wireless/strip.c | |
| parent | d092633bff3b19faffc480fe9810805e7792a029 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'drivers/net/wireless/strip.c')
| -rw-r--r-- | drivers/net/wireless/strip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c index 883af891ebfb..417e9e675fac 100644 --- a/drivers/net/wireless/strip.c +++ b/drivers/net/wireless/strip.c | |||
| @@ -2728,7 +2728,7 @@ static int strip_ioctl(struct tty_struct *tty, struct file *file, | |||
| 2728 | /************************************************************************/ | 2728 | /************************************************************************/ |
| 2729 | /* Initialization */ | 2729 | /* Initialization */ |
| 2730 | 2730 | ||
| 2731 | static struct tty_ldisc strip_ldisc = { | 2731 | static struct tty_ldisc_ops strip_ldisc = { |
| 2732 | .magic = TTY_LDISC_MAGIC, | 2732 | .magic = TTY_LDISC_MAGIC, |
| 2733 | .name = "strip", | 2733 | .name = "strip", |
| 2734 | .owner = THIS_MODULE, | 2734 | .owner = THIS_MODULE, |