diff --git a/[refs] b/[refs] index ab3b762e51e3..72466ac02586 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2eda013f4894bc200124f791a56c4defb613a0cc +refs/heads/master: 4d922612df8bd1202a1f51d95b78aca3d67302cd diff --git a/trunk/include/linux/usb.h b/trunk/include/linux/usb.h index 27a4e16d2bf1..69d845739bc2 100644 --- a/trunk/include/linux/usb.h +++ b/trunk/include/linux/usb.h @@ -1073,6 +1073,7 @@ typedef void (*usb_complete_t)(struct urb *); * which the host controller driver should use in preference to the * transfer_buffer. * @sg: scatter gather buffer list + * @num_mapped_sgs: (internal) number of mapped sg entries * @num_sgs: number of entries in the sg list * @transfer_buffer_length: How big is transfer_buffer. The transfer may * be broken up into chunks according to the current maximum packet