summaryrefslogtreecommitdiff
path: root/include/uapi/linux/usb/functionfs.h
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2014-07-16 20:10:27 +0400
committerJames Morris <james.l.morris@oracle.com>2014-07-16 20:10:27 +0400
commitbd89bb78f35fd175db7a9cfc504d789b6ca0f7b0 (patch)
treedee9f8b31f3d6d2fb141541da88e1cc1329b017e /include/uapi/linux/usb/functionfs.h
parentf01387d2693813eb5271a3448e6a082322c7d75d (diff)
parent1795cd9b3a91d4b5473c97f491d63892442212ab (diff)
downloadlinux-bd89bb78f35fd175db7a9cfc504d789b6ca0f7b0.tar.xz
Sync with the changes pushed by Serge in the last merge window.
Diffstat (limited to 'include/uapi/linux/usb/functionfs.h')
-rw-r--r--include/uapi/linux/usb/functionfs.h7
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: