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/mos7840.c between commit adc8d746caa6 ("tty: move the
termios object into the tty") from the tty tree and commit 9c134a14f2da
("USB: serial: mos7840.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/mos7840.c
index 402c32d,ffbe4ee..0000000
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@@ -2159,15 -2086,15 +2086,15 @@@ static void mos7840_set_termios(struct 
  		return;
  	}
  
- 	dbg("%s", "setting termios - ");
+ 	dev_dbg(&port->dev, "%s", "setting termios - \n");
  
 -	cflag = tty->termios->c_cflag;
 +	cflag = tty->termios.c_cflag;
  
- 	dbg("%s - clfag %08x iflag %08x", __func__,
- 	    tty->termios.c_cflag, RELEVANT_IFLAG(tty->termios.c_iflag));
- 	dbg("%s - old clfag %08x old iflag %08x", __func__,
- 	    old_termios->c_cflag, RELEVANT_IFLAG(old_termios->c_iflag));
- 	dbg("%s - port %d", __func__, port->number);
+ 	dev_dbg(&port->dev, "%s - clfag %08x iflag %08x\n", __func__,
 -		tty->termios->c_cflag, RELEVANT_IFLAG(tty->termios->c_iflag));
++		tty->termios.c_cflag, RELEVANT_IFLAG(tty->termios.c_iflag));
+ 	dev_dbg(&port->dev, "%s - old clfag %08x old iflag %08x\n", __func__,
+ 		old_termios->c_cflag, RELEVANT_IFLAG(old_termios->c_iflag));
+ 	dev_dbg(&port->dev, "%s - port %d\n", __func__, port->number);
  
  	/* change the port settings to the new ones specified */

Attachment: pgp00000.pgp
Description: PGP signature