diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-17 14:45:02 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-17 14:45:02 -0800 |
commit | 6e9c6e87a662c6665053fc3cc7840ed6fa80414e (patch) | |
tree | 2c573ee6bd9e9d77b35ec956e3dfe8aca0ae6fa6 /include/linux/usb.h | |
parent | e6bed035ca652c43c897731366ea816ea2c4fbf1 (diff) | |
parent | 6d0abeca3242a88cab8232e4acd7e2bf088f3bc2 (diff) | |
download | blackbird-obmc-linux-6e9c6e87a662c6665053fc3cc7840ed6fa80414e.tar.gz blackbird-obmc-linux-6e9c6e87a662c6665053fc3cc7840ed6fa80414e.zip |
Merge 3.14-rc3 into staging-next
We want the fixes in this branch to make testing and future work easier.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/usb.h')
-rw-r--r-- | include/linux/usb.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index f434619f3975..22de4affe9c8 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -1265,8 +1265,6 @@ typedef void (*usb_complete_t)(struct urb *); * @sg: scatter gather buffer list, the buffer size of each element in * the list (except the last) must be divisible by the endpoint's * max packet size if no_sg_constraint isn't set in 'struct usb_bus' - * (FIXME: scatter-gather under xHCI is broken for periodic transfers. - * Do not use urb->sg for interrupt endpoints for now, only bulk.) * @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 |