Merge tag 'for-linus-v3.7-rc1' of git://oss.sgi.com/xfs/xfs

[karo-tx-linux.git] / drivers / usb / serial / console.c

diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
index 335f98d092cc7c173466c9735bab777932907590..5f3bcd31e2045b89a821e1bfe10814d6089534ca 100644 (file)
--- a/drivers/usb/serial/console.c
+++ b/drivers/usb/serial/console.c
@@ -22,8 +22,6 @@
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 
-static int debug;
-
 struct usbcons_info {
        int                     magic;
        int                     break_flag;
@@ -164,8 +162,8 @@ static int usb_console_setup(struct console *co, char *options)
                }
 
                if (serial->type->set_termios) {
-                       tty->termios->c_cflag = cflag;
-                       tty_termios_encode_baud_rate(tty->termios, baud, baud);
+                       tty->termios.c_cflag = cflag;
+                       tty_termios_encode_baud_rate(&tty->termios, baud, baud);
                        memset(&dummy, 0, sizeof(struct ktermios));
                        serial->type->set_termios(tty, port, &dummy);
 
@@ -283,10 +281,8 @@ void usb_serial_console_disconnect(struct usb_serial *serial)
        }
 }
 
-void usb_serial_console_init(int serial_debug, int minor)
+void usb_serial_console_init(int minor)
 {
-       debug = serial_debug;
-
        if (minor == 0) {
                /*
                 * Call register_console() if this is the first device plugged