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/navman.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/navman.c')
| -rw-r--r-- | drivers/usb/serial/navman.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/serial/navman.c b/drivers/usb/serial/navman.c index f5f3751a888c..5ceaa4c6be09 100644 --- a/drivers/usb/serial/navman.c +++ b/drivers/usb/serial/navman.c | |||
| @@ -80,8 +80,7 @@ exit: | |||
| 80 | __func__, result); | 80 | __func__, result); |
| 81 | } | 81 | } |
| 82 | 82 | ||
| 83 | static int navman_open(struct tty_struct *tty, | 83 | static int navman_open(struct tty_struct *tty, struct usb_serial_port *port) |
| 84 | struct usb_serial_port *port, struct file *filp) | ||
| 85 | { | 84 | { |
| 86 | int result = 0; | 85 | int result = 0; |
| 87 | 86 | ||