diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-13 08:36:50 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-13 08:36:50 +0400 |
| commit | 6dda8e594bde0a2ca0d5e64c6e0240e76166fa69 (patch) | |
| tree | eb8fdc70db202197b14af35e59289e0697086a6a /include/uapi/linux/usb/functionfs.h | |
| parent | 89d70e99fff9012fe8a38363f2c46e6ee23a6f47 (diff) | |
| parent | d0e3bc813359360fb94098fec9403820846577f3 (diff) | |
| download | linux-6dda8e594bde0a2ca0d5e64c6e0240e76166fa69.tar.xz | |
Merge tag 'ux500-devicetree-v3.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt
Merge "Ux500 devicetree changes for v3.17" from Linus Walleij:
Ux500 device tree patches for v3.17:
- Add regulators to STMPE expanders
- Add proper DMA channels for all SD/MMC blocks
- Add sensors to the device tree
* tag 'ux500-devicetree-v3.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: ux500: add misc sensors to the device trees
ARM: ux500: add some DB8500 DMA channel info
ARM: ux500: add VCC and VIO regulators to STMPE IC
+ Linux 3.16-rc4
Signed-off-by: Olof Johansson <olof@lixom.net>
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 { __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)); /* * Descriptors format: |