diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-11-03 09:10:07 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-11-03 09:10:07 +0300 |
| commit | 7a53c7f56bbfc9b0ef892e68f5cfae3d902544d1 (patch) | |
| tree | 19dec256fc80ad06d631ece78b9eb68a457ce66b /drivers/usb/serial/keyspan.c | |
| parent | e57130698fe3dd2b7d617d90bbf86474473cb40c (diff) | |
| parent | 012abeea669ea49636cf952d13298bb68654146a (diff) | |
| download | linux-7a53c7f56bbfc9b0ef892e68f5cfae3d902544d1.tar.xz | |
Merge commit 'v2.6.32-rc5' into for-linus
Diffstat (limited to 'drivers/usb/serial/keyspan.c')
| -rw-r--r-- | drivers/usb/serial/keyspan.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c index 2594b8743d3f..f8c4b07033ff 100644 --- a/drivers/usb/serial/keyspan.c +++ b/drivers/usb/serial/keyspan.c @@ -1209,8 +1209,7 @@ static int keyspan_write_room(struct tty_struct *tty) } -static int keyspan_open(struct tty_struct *tty, - struct usb_serial_port *port, struct file *filp) +static int keyspan_open(struct tty_struct *tty, struct usb_serial_port *port) { struct keyspan_port_private *p_priv; struct keyspan_serial_private *s_priv; |