diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 11:02:45 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 11:02:45 +0200 |
| commit | e27772b48df91a954a74b1411b57d83b945a58c7 (patch) | |
| tree | ebd4a434d9e3cbd0844109e4469f91daac581b59 /drivers/input/serio | |
| parent | d092633bff3b19faffc480fe9810805e7792a029 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
| download | talos-obmc-linux-e27772b48df91a954a74b1411b57d83b945a58c7.tar.gz talos-obmc-linux-e27772b48df91a954a74b1411b57d83b945a58c7.zip | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/serport.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/serport.c b/drivers/input/serio/serport.c index 7ff71ba7b7c9..b9694b6445d0 100644 --- a/drivers/input/serio/serport.c +++ b/drivers/input/serio/serport.c @@ -216,7 +216,7 @@ static void serport_ldisc_write_wakeup(struct tty_struct * tty) * The line discipline structure. */ -static struct tty_ldisc serport_ldisc = { +static struct tty_ldisc_ops serport_ldisc = { .owner = THIS_MODULE, .name = "input", .open = serport_ldisc_open, |
