diff options
| author | Tom Rini <trini@konsulko.com> | 2020-10-20 08:01:46 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-10-20 08:01:46 -0400 |
| commit | f216259927be2f1f952fc69139e1e9b0c798eb1d (patch) | |
| tree | 9cb2c547a22eb2ceede02a4ff27cc39bbacdbd6a /include | |
| parent | 7ec87e4192215815b658c3f8b34e4be010103149 (diff) | |
| parent | 0cd791ced96e1510b26305c20f1199ee0d980902 (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-usb
- MediaTek USB host support
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/usb/ch9.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/usb/ch9.h b/include/linux/usb/ch9.h index 989a5fcbd96..a8fa5d74490 100644 --- a/include/linux/usb/ch9.h +++ b/include/linux/usb/ch9.h @@ -956,10 +956,9 @@ enum usb_device_speed { USB_SPEED_HIGH, /* usb 2.0 */ USB_SPEED_WIRELESS, /* wireless (usb 2.5) */ USB_SPEED_SUPER, /* usb 3.0 */ + USB_SPEED_SUPER_PLUS, /* usb 3.1 */ }; -#ifdef __KERNEL__ - /** * usb_speed_string() - Returns human readable-name of the speed. * @speed: The speed to return human-readable name for. If it's not @@ -968,8 +967,6 @@ enum usb_device_speed { */ extern const char *usb_speed_string(enum usb_device_speed speed); -#endif - enum usb_device_state { /* NOTATTACHED isn't in the USB spec, and this state acts * the same as ATTACHED ... but it's clearer this way. |
