diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2014-07-28 17:09:42 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-07-28 17:09:42 -0400 |
| commit | 6da287ad0266cca1fa8f88fb8b1c466e8164671f (patch) | |
| tree | cfdf86c200bf9f1199c45acf51644fc185c705ec /include/uapi/linux/usb/functionfs.h | |
| parent | ccaba4527156da1619a23bafcb944e8e029d0573 (diff) | |
| parent | 6887d9e5682886b5d9fe81217ff2f1410724cdb9 (diff) | |
Merge branch 'v3.17-next/power-exynos' into v3.17-next/dt-samsung-2
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: |