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

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/serial/ftdi_sio.c between commit
436d74ab8174ba48ad97c3de80c8de6aaff6c931 ("tty-usb-ft232-latency") from
the ttydev tree and commit ac0ceefdc8cdf4bbe6cdaf6d2175e0dfdbfd6700
("USB: ftdi_sio: fix hi-speed device packet size calculation") from the
usb tree.

Overlapping additions.  I fixed it up (see below), but have no idea if
there are higher level interactions (or the ordering is right) i.e.
please check this.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/usb/serial/ftdi_sio.c
index 59c7501,ec20993..0000000
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@@ -1417,7 -1500,7 +1524,8 @@@ static int ftdi_sio_port_probe(struct u
  	usb_set_serial_port_data(port, priv);
  
  	ftdi_determine_type(port);
 +	read_latency_timer(port);
+ 	ftdi_set_max_packet_size(port);
  	create_sysfs_attrs(port);
  	return 0;
  }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/