Merge branch 'fix/asoc' into for-linus

[pandora-kernel.git] / drivers / usb / serial / keyspan.h

diff --git a/drivers/usb/serial/keyspan.h b/drivers/usb/serial/keyspan.h
index ce134dc..13fa1d1 100644 (file)
--- a/drivers/usb/serial/keyspan.h
+++ b/drivers/usb/serial/keyspan.h
@@ -58,10 +58,9 @@ static void keyspan_set_termios              (struct tty_struct *tty,
                                         struct ktermios *old);
 static void keyspan_break_ctl          (struct tty_struct *tty,
                                         int break_state);
-static int  keyspan_tiocmget           (struct tty_struct *tty,
-                                        struct file *file);
+static int  keyspan_tiocmget           (struct tty_struct *tty);
 static int  keyspan_tiocmset           (struct tty_struct *tty,
-                                        struct file *file, unsigned int set,
+                                        unsigned int set,
                                         unsigned int clear);
 static int  keyspan_fake_startup       (struct usb_serial *serial);