diff options
| author | Alex Shi <alex.shi@linaro.org> | 2014-07-10 14:11:09 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-07-10 14:11:09 +0800 |
| commit | d8e045867020ad8d258b1c21ae86930f5449bfd3 (patch) | |
| tree | ed9d3e8562dfce617c25ba3d51c54d359221a363 /include | |
| parent | 9e63e819393e3d7d4d71b50b02b3996d0f422902 (diff) | |
| parent | c0cbbdebe91a944d653ca75670b77bbf57498150 (diff) | |
Merge tag 'v3.14.12' into linux-linaro-lsk-v3.14
This is the 3.14.12 stable release
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/usb/functionfs.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/uapi/linux/usb/functionfs.h b/include/uapi/linux/usb/functionfs.h index d6b01283f85c..29e9c7aa9c66 100644 --- a/include/uapi/linux/usb/functionfs.h +++ b/include/uapi/linux/usb/functionfs.h @@ -27,6 +27,13 @@ struct usb_endpoint_descriptor_no_audio { __u8 bInterval; } __attribute__((packed)); +/* Legacy format, deprecated as of 3.14. */ +struct usb_functionfs_descs_head { + __le32 magic; + __le32 length; + __le32 fs_count; + __le32 hs_count; +} __attribute__((packed, deprecated)); /* * All numbers must be in little endian order. |