Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm

[karo-tx-linux.git] / drivers / staging / serqt_usb2 / serqt_usb2.c

diff --git a/drivers/staging/serqt_usb2/serqt_usb2.c b/drivers/staging/serqt_usb2/serqt_usb2.c
index 0fdf8c6dc648a69eaeeac311b1e24a3cb51d85e9..52af44cfbe83a66dd45b1b65034247362648cebe 100644 (file)
--- 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;