diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-19 17:59:07 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-19 17:59:07 -0400 |
| commit | 4e9816d012dbc28dc89559261c6ffbf8ffc440dd (patch) | |
| tree | dee9f8b31f3d6d2fb141541da88e1cc1329b017e /include/uapi/linux/usb/functionfs.h | |
| parent | da98f44f27d81d7fe9a41f69af4fe08c18d13b56 (diff) | |
| parent | 1795cd9b3a91d4b5473c97f491d63892442212ab (diff) | |
Merge tag 'v3.16-rc5' into next/fixes-non-critical
Linux 3.16-rc5
Diffstat (limited to 'include/uapi/linux/usb/functionfs.h')
| -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 2a4b4a72a4f9..24b68c59dcf8 100644 --- a/include/uapi/linux/usb/functionfs.h +++ b/include/uapi/linux/usb/functionfs.h | |||
| @@ -33,6 +33,13 @@ struct usb_endpoint_descriptor_no_audio { | |||
| 33 | __u8 bInterval; | 33 | __u8 bInterval; |
| 34 | } __attribute__((packed)); | 34 | } __attribute__((packed)); |
| 35 | 35 | ||
| 36 | /* Legacy format, deprecated as of 3.14. */ | ||
| 37 | struct usb_functionfs_descs_head { | ||
| 38 | __le32 magic; | ||
| 39 | __le32 length; | ||
| 40 | __le32 fs_count; | ||
| 41 | __le32 hs_count; | ||
| 42 | } __attribute__((packed, deprecated)); | ||
| 36 | 43 | ||
| 37 | /* | 44 | /* |
| 38 | * Descriptors format: | 45 | * Descriptors format: |