diff --git a/[refs] b/[refs] index 55cef0dd3ae5..19243c8f1f27 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d7971051e4df825e0bc11b995e87bfe86355b8e5 +refs/heads/master: e5b33dc9d16053c2ae4c2c669cf008829530364b diff --git a/trunk/include/linux/usb/serial.h b/trunk/include/linux/usb/serial.h index ef9be7e1e190..1819b59aab2a 100644 --- a/trunk/include/linux/usb/serial.h +++ b/trunk/include/linux/usb/serial.h @@ -66,6 +66,7 @@ * port. * @flags: usb serial port flags * @write_wait: a wait_queue_head_t used by the port. + * @delta_msr_wait: modem-status-change wait queue * @work: work queue entry for the line discipline waking up. * @throttled: nonzero if the read urb is inactive to throttle the device * @throttle_req: nonzero if the tty wants to throttle us @@ -112,6 +113,7 @@ struct usb_serial_port { unsigned long flags; wait_queue_head_t write_wait; + wait_queue_head_t delta_msr_wait; struct work_struct work; char throttled; char throttle_req;