path: root/include
diff options
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-30 21:15:15 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-30 21:15:15 -0700
commitba1ba3a4ed0c5c6a6121169abe61802aeab6c1d2 (patch)
tree91ca78d7105c0fbe46821f1896f44c05351e5fd6 /include
parent8ecd93ab84ce018e032298f55e1b18ada0362850 (diff)
parent8035691365b80428c58908215d4408559afe7cb3 (diff)
Merge tag 'fixes-for-v3.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus
Felipe writes: usb: fixes for v3.16-rc4 A few more fixes for this RC cycle. There's a revert of a previous patch which ended up being the wrong version, so we reverted that commit and applied a better fix. CPPI41 got a race condition fix which was found by Thomas Gleixner. The MSM PHY driver got a runtime pm usage fix so that it wouldn't kill the PHY while it was still being used. We also have a fix for a panic caused when removing musb_am335x driver. Other than that, a few other minor fixes. Signed-of-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'include')
1 files changed, 8 insertions, 1 deletions
diff --git a/include/uapi/linux/usb/functionfs.h b/include/uapi/linux/usb/functionfs.h
index ecb3a31f7ca6..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:
@@ -53,7 +60,7 @@ struct usb_endpoint_descriptor_no_audio {
* structure. Any flags that are not recognised cause the whole block to be
* rejected with -ENOSYS.
- * Legacy descriptors format (deprecated as of 3.14):
+ * Legacy descriptors format:
* | off | name | type | description |
* |-----+-----------+--------------+--------------------------------------|

Privacy Policy