diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-11 17:47:26 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-11 17:47:26 +0300 |
| commit | ba7756d08212f71a009a4ac7439b8e661e469f7d (patch) | |
| tree | 0113550cf46cda48be8fb6d06a33935aa034d2c0 /include/uapi | |
| parent | a6308d700b9b29cc365758f4e0ccad69696107d3 (diff) | |
| parent | 48eab1f28d49a3eeda050ad03fddf24a594c1f79 (diff) | |
| download | linux-ba7756d08212f71a009a4ac7439b8e661e469f7d.tar.xz | |
Merge tag 'usb-for-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
Felipe writes:
usb: changes for v4.12
With 51 non-merge commits, this is one of the smallest USB Gadget pull
requests. Apart from your expected set of non-critical fixes, and
other miscellaneous items, we have most of the changes in dwc3 (52.5%)
with all other UDCs following with 34.8%.
As for the actual changes, the most important of them are all the
recent changes to reduce memory footprint of dwc3, bare minimum
dual-role support on dwc3 and reworked endpoint count and
initialization routines.
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/usb/functionfs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/usb/functionfs.h b/include/uapi/linux/usb/functionfs.h index b2a31a55a612..062606f02309 100644 --- a/include/uapi/linux/usb/functionfs.h +++ b/include/uapi/linux/usb/functionfs.h @@ -158,7 +158,7 @@ struct usb_ext_prop_desc { * |-----+-----------------------+------+-------------------------------------| * | 0 | bFirstInterfaceNumber | U8 | index of the interface or of the 1st| * | | | | interface in an IAD group | - * | 1 | Reserved | U8 | 0 | + * | 1 | Reserved | U8 | 1 | * | 2 | CompatibleID | U8[8]| compatible ID string | * | 10 | SubCompatibleID | U8[8]| subcompatible ID string | * | 18 | Reserved | U8[6]| 0 | |