summaryrefslogtreecommitdiff
path: root/include/uapi
diff options
context:
space:
mode:
authorMichal Nazarewicz <mina86@mina86.com>2014-06-13 15:38:04 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-09 11:18:24 -0700
commit28c5980b5494b8163d6cba5a5007b6ec7e63de66 (patch)
treec777d8e0b368a462fda84aa0cf7952d8500e2763 /include/uapi
parentde49c5f1702ce48835fcf9e13e11314ec9f1be28 (diff)
downloadkernel-common-28c5980b5494b8163d6cba5a5007b6ec7e63de66.tar.gz
kernel-common-28c5980b5494b8163d6cba5a5007b6ec7e63de66.tar.bz2
kernel-common-28c5980b5494b8163d6cba5a5007b6ec7e63de66.zip
usb: gadget: f_fs: resurect usb_functionfs_descs_head structure
commit 09122141785348bf9539762a5f5dbbae3761c783 upstream. Even though usb_functionfs_descs_head structure is now deprecated, it has been used by some user space tools. Its removel in commit [ac8dde1: “Add flags to descriptors block”] was an oversight leading to build breakage for such tools. Bring it back so that old user space tools can still be build without problems on newer kernel versions. Reported-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Reported-by: Krzysztof Opasiak <k.opasiak@samsung.com> Signed-off-by: Michal Nazarewicz <mina86@mina86.com> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/uapi')
-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 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.