summaryrefslogtreecommitdiffstats
path: root/include/uapi
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2013-02-08 12:13:43 +1000
committerDave Airlie <airlied@redhat.com>2013-02-08 12:13:43 +1000
commit62cd2fa82a38cb3d653517822c62a39cdbb5f365 (patch)
treeb5d2f198c14455822c8b03abde2c8d8080cda24a /include/uapi
parent6dc1c49da6dd3bf020a66b2a135b9625ac01c2c7 (diff)
parentae1287865f5361fa138d4d3b1b6277908b54eac9 (diff)
downloadblackbird-op-linux-62cd2fa82a38cb3d653517822c62a39cdbb5f365.tar.gz
blackbird-op-linux-62cd2fa82a38cb3d653517822c62a39cdbb5f365.zip
Merge branch 'console-fixes' into drm-next
(not the fbcon maintainer pull 2) fix bug in vgacon on bootup and fbcon losing fonts on startup. * console-fixes: (50 commits) fbcon: don't lose the console font across generic->chip driver switch vgacon/vt: clear buffer attributes when we load a 512 character font (v2)
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/linux/usb/ch9.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/uapi/linux/usb/ch9.h b/include/uapi/linux/usb/ch9.h
index 50598472dc41..f738e25377ff 100644
--- a/include/uapi/linux/usb/ch9.h
+++ b/include/uapi/linux/usb/ch9.h
@@ -152,6 +152,12 @@
#define USB_INTRF_FUNC_SUSPEND_LP (1 << (8 + 0))
#define USB_INTRF_FUNC_SUSPEND_RW (1 << (8 + 1))
+/*
+ * Interface status, Figure 9-5 USB 3.0 spec
+ */
+#define USB_INTRF_STAT_FUNC_RW_CAP 1
+#define USB_INTRF_STAT_FUNC_RW 2
+
#define USB_ENDPOINT_HALT 0 /* IN/OUT will STALL */
/* Bit array elements as returned by the USB_REQ_GET_STATUS request. */
OpenPOWER on IntegriCloud