summaryrefslogtreecommitdiffstats
path: root/include/uapi
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-24 09:58:58 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-24 09:58:58 -0400
commit135e7d0d4a488df06c2301c74e190a8aff6f75ab (patch)
tree6e49ce0dfd101cd439414eee9b9f46ef658fb561 /include/uapi
parenta497c3ba1d97fc69c1e78e7b96435ba8c2cb42ee (diff)
parent5d881802c407d83c169c875dad88fe2bba066c33 (diff)
downloadlinux-135e7d0d4a488df06c2301c74e190a8aff6f75ab.tar.gz
linux-135e7d0d4a488df06c2301c74e190a8aff6f75ab.tar.bz2
linux-135e7d0d4a488df06c2301c74e190a8aff6f75ab.zip
Merge tag 'fixes-for-v3.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus
usb: fixes for v3.16-rc2 dwc3-omap won't crash anymore on module removal and suspend/resume won't kill xHCI interrupts. MUSB got a fix to handle Babble condition only in host mode, how it should be. The f_fs function driver got a fix for a NULL pointer dereference. Renesas gadget got a fix for Status stage handling. Signed-of-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/linux/usb/functionfs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/usb/functionfs.h b/include/uapi/linux/usb/functionfs.h
index 2a4b4a72a4f9..ecb3a31f7ca6 100644
--- a/include/uapi/linux/usb/functionfs.h
+++ b/include/uapi/linux/usb/functionfs.h
@@ -53,7 +53,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:
+ * Legacy descriptors format (deprecated as of 3.14):
*
* | off | name | type | description |
* |-----+-----------+--------------+--------------------------------------|