diff options
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 72e4d48f51e9..41b0ad2d56ac 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -595,7 +595,7 @@ static int ftdi_chars_in_buffer (struct usb_serial_port *port); | |||
595 | static void ftdi_write_bulk_callback (struct urb *urb); | 595 | static void ftdi_write_bulk_callback (struct urb *urb); |
596 | static void ftdi_read_bulk_callback (struct urb *urb); | 596 | static void ftdi_read_bulk_callback (struct urb *urb); |
597 | static void ftdi_process_read (struct work_struct *work); | 597 | static void ftdi_process_read (struct work_struct *work); |
598 | static void ftdi_set_termios (struct usb_serial_port *port, struct termios * old); | 598 | static void ftdi_set_termios (struct usb_serial_port *port, struct ktermios * old); |
599 | static int ftdi_tiocmget (struct usb_serial_port *port, struct file *file); | 599 | static int ftdi_tiocmget (struct usb_serial_port *port, struct file *file); |
600 | static int ftdi_tiocmset (struct usb_serial_port *port, struct file * file, unsigned int set, unsigned int clear); | 600 | static int ftdi_tiocmset (struct usb_serial_port *port, struct file * file, unsigned int set, unsigned int clear); |
601 | static int ftdi_ioctl (struct usb_serial_port *port, struct file * file, unsigned int cmd, unsigned long arg); | 601 | static int ftdi_ioctl (struct usb_serial_port *port, struct file * file, unsigned int cmd, unsigned long arg); |
@@ -1880,7 +1880,7 @@ static void ftdi_break_ctl( struct usb_serial_port *port, int break_state ) | |||
1880 | * WARNING: set_termios calls this with old_termios in kernel space | 1880 | * WARNING: set_termios calls this with old_termios in kernel space |
1881 | */ | 1881 | */ |
1882 | 1882 | ||
1883 | static void ftdi_set_termios (struct usb_serial_port *port, struct termios *old_termios) | 1883 | static void ftdi_set_termios (struct usb_serial_port *port, struct ktermios *old_termios) |
1884 | { /* ftdi_termios */ | 1884 | { /* ftdi_termios */ |
1885 | struct usb_device *dev = port->serial->dev; | 1885 | struct usb_device *dev = port->serial->dev; |
1886 | unsigned int cflag = port->tty->termios->c_cflag; | 1886 | unsigned int cflag = port->tty->termios->c_cflag; |