diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-10 23:12:55 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-10 23:13:53 +0400 |
| commit | 7483948fdd31a8642ef0288aab6f368b98d53c29 (patch) | |
| tree | 031020a5553701d2aae8dddb0fa509aa65854eb1 /include/linux/usb.h | |
| parent | 22a416c4e0f2179b57028e084ac0ed2c110333bd (diff) | |
| parent | fe250923bbbbcbccc9aa7b84d05ee7a060450534 (diff) | |
| download | linux-7483948fdd31a8642ef0288aab6f368b98d53c29.tar.xz | |
Merge tag 'usb-3.3-rc3' into usb-next
This is done to resolve a merge conflict with:
drivers/usb/class/cdc-wdm.c
and to better handle future patches for this driver as it is under
active development at the moment.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/usb.h')
| -rw-r--r-- | include/linux/usb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index b2eb3a47caf5..0c51663f2733 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -1081,6 +1081,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 |