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/digi_acceleport.c between commit adc8d746caa6 ("tty:
move the termios object into the tty") from the tty tree and commit
f9dfbebb8b39 ("USB: serial: digi_acceleport.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                    s...@canb.auug.org.au

diff --cc drivers/usb/serial/digi_acceleport.c
index afd9d2e,d3a8941..0000000
--- a/drivers/usb/serial/digi_acceleport.c
+++ b/drivers/usb/serial/digi_acceleport.c
@@@ -687,8 -685,9 +685,9 @@@ static void digi_set_termios(struct tty
                struct usb_serial_port *port, struct ktermios *old_termios)
  {
        struct digi_port *priv = usb_get_serial_port_data(port);
+       struct device *dev = &port->dev;
 -      unsigned int iflag = tty->termios->c_iflag;
 -      unsigned int cflag = tty->termios->c_cflag;
 +      unsigned int iflag = tty->termios.c_iflag;
 +      unsigned int cflag = tty->termios.c_cflag;
        unsigned int old_iflag = old_termios->c_iflag;
        unsigned int old_cflag = old_termios->c_cflag;
        unsigned char buf[32];

pgpx1NSLN5I6T.pgp
Description: PGP signature