diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 17:32:04 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 17:32:04 +1000 |
| commit | 1a4072a95e8f79c2e52aed795e0e54428b0f31fc (patch) | |
| tree | 6e7aa0663141156aa8fd57c8120a0aa76daf8d66 /drivers/staging/serqt_usb2/serqt_usb2.c | |
| parent | 111a3b94375ee87535ac985de4c94be5e5634881 (diff) | |
| parent | c0e03fabb4f2a6e48f6e0b55729b26a599a2bd02 (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/at76_usb/at76_usb.c
drivers/staging/epl/VirtualEthernetLinux.c
Diffstat (limited to 'drivers/staging/serqt_usb2/serqt_usb2.c')
| -rw-r--r-- | drivers/staging/serqt_usb2/serqt_usb2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/serqt_usb2/serqt_usb2.c b/drivers/staging/serqt_usb2/serqt_usb2.c index 0fdf8c6dc648..52af44cfbe83 100644 --- a/drivers/staging/serqt_usb2/serqt_usb2.c +++ b/drivers/staging/serqt_usb2/serqt_usb2.c @@ -874,7 +874,7 @@ static void qt_release(struct usb_serial *serial) } static int qt_open(struct tty_struct *tty, - struct usb_serial_port *port, struct file *filp) + struct usb_serial_port *port) { struct usb_serial *serial; struct quatech_port *quatech_port; |