Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

David S. Miller committed 9 years ago

Commit bb1d3032 parents 3b647be 811a919222 files · +2064 −1233Browse files

Showing the changes to include/uapi/linux (1 of 222 files). Show all

Unified · Split

include/uapi/linux/usb/functionfs.h+1−0

@@ -93,6 +93,7 @@ struct usb_ext_prop_desc { · 92 unmodified lines
93	* \| 0 \| magic \| LE32 \| FUNCTIONFS_DESCRIPTORS_MAGIC_V2 \|	93	* \| 0 \| magic \| LE32 \| FUNCTIONFS_DESCRIPTORS_MAGIC_V2 \|
94	* \| 4 \| length \| LE32 \| length of the whole data chunk \|	94	* \| 4 \| length \| LE32 \| length of the whole data chunk \|
95	* \| 8 \| flags \| LE32 \| combination of functionfs_flags \|	95	* \| 8 \| flags \| LE32 \| combination of functionfs_flags \|
		96	* \| \| eventfd \| LE32 \| eventfd file descriptor \|
96	* \| \| fs_count \| LE32 \| number of full-speed descriptors \|	97	* \| \| fs_count \| LE32 \| number of full-speed descriptors \|
97	* \| \| hs_count \| LE32 \| number of high-speed descriptors \|	98	* \| \| hs_count \| LE32 \| number of high-speed descriptors \|
98	* \| \| ss_count \| LE32 \| number of super-speed descriptors \|	99	* \| \| ss_count \| LE32 \| number of super-speed descriptors \|