diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-12-13 03:29:52 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-12-13 03:29:52 -0500 |
| commit | 354d14b3f53cc749c5d26d4ba7280d1e931d6bc4 (patch) | |
| tree | 59b597e44902d8db8bde7deac1e7e707327c6fe6 /drivers/char/pcmcia/synclink_cs.c | |
| parent | 5144c534d16529bc469396211131e8935589f833 (diff) | |
| parent | 5b84ba26a9672e615897234fa5efd3eea2d6b295 (diff) | |
Merge branch 'topic/workq-update' into topic/misc
Diffstat (limited to 'drivers/char/pcmcia/synclink_cs.c')
| -rw-r--r-- | drivers/char/pcmcia/synclink_cs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c index bfc10f89d951..eaa41992fbe2 100644 --- a/drivers/char/pcmcia/synclink_cs.c +++ b/drivers/char/pcmcia/synclink_cs.c | |||
| @@ -2796,6 +2796,7 @@ static const struct tty_operations mgslpc_ops = { | |||
| 2796 | .hangup = mgslpc_hangup, | 2796 | .hangup = mgslpc_hangup, |
| 2797 | .tiocmget = tiocmget, | 2797 | .tiocmget = tiocmget, |
| 2798 | .tiocmset = tiocmset, | 2798 | .tiocmset = tiocmset, |
| 2799 | .get_icount = mgslpc_get_icount, | ||
| 2799 | .proc_fops = &mgslpc_proc_fops, | 2800 | .proc_fops = &mgslpc_proc_fops, |
| 2800 | }; | 2801 | }; |
| 2801 | 2802 | ||