linux-next: manual merge of the usb tree with the tty tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/serial/kl5kusb105.c between commit adc8d746caa6 ("tty: move
the termios object into the tty") from the tty tree and commit
1ad7604f69ae ("USB: serial: kl5kusb105.c: remove dbg() usage") from the
usb tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/usb/serial/kl5kusb105.c
index def9ad2,e4aa6c0..0000000
--- a/drivers/usb/serial/kl5kusb105.c
+++ b/drivers/usb/serial/kl5kusb105.c
@@@ -445,9 -445,10 +445,10 @@@ static void klsi_105_set_termios(struc
  				 struct ktermios *old_termios)
  {
  	struct klsi_105_private *priv = usb_get_serial_port_data(port);
+ 	struct device *dev = &port->dev;
 -	unsigned int iflag = tty->termios->c_iflag;
 +	unsigned int iflag = tty->termios.c_iflag;
  	unsigned int old_iflag = old_termios->c_iflag;
 -	unsigned int cflag = tty->termios->c_cflag;
 +	unsigned int cflag = tty->termios.c_cflag;
  	unsigned int old_cflag = old_termios->c_cflag;
  	struct klsi_105_port_settings *cfg;
  	unsigned long flags;

Attachment: pgp00000.pgp
Description: PGP signature