diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-21 06:51:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-21 06:51:42 -0400 |
| commit | ae82bfd61ca7e57cc2d914add9ab0873e260f2f5 (patch) | |
| tree | a7f862ad8b0ae4f2e8953e6aa613eb702b484ecf /drivers/usb/serial/generic.c | |
| parent | cd74c86bdf705f824d494a2bbda393d1d562b40a (diff) | |
| parent | ebc79c4f8da0f92efa968e0328f32334a2ce80cf (diff) | |
Merge branch 'linus' into perfcounters/rename
Merge reason: pull in all the latest code before doing the rename.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/usb/serial/generic.c')
| -rw-r--r-- | drivers/usb/serial/generic.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c index ce57f6a32bdf..d9398e9f30ce 100644 --- a/drivers/usb/serial/generic.c +++ b/drivers/usb/serial/generic.c | |||
| @@ -114,8 +114,7 @@ void usb_serial_generic_deregister(void) | |||
| 114 | #endif | 114 | #endif |
| 115 | } | 115 | } |
| 116 | 116 | ||
| 117 | int usb_serial_generic_open(struct tty_struct *tty, | 117 | int usb_serial_generic_open(struct tty_struct *tty, struct usb_serial_port *port) |
| 118 | struct usb_serial_port *port, struct file *filp) | ||
| 119 | { | 118 | { |
| 120 | struct usb_serial *serial = port->serial; | 119 | struct usb_serial *serial = port->serial; |
| 121 | int result = 0; | 120 | int result = 0; |