diff options
author | Patrick Ziegler <patrick.ziegler@fh-kl.de> | 2013-08-15 14:40:35 +0200 |
---|---|---|
committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-08-15 19:56:27 -0700 |
commit | ad1858c98f2e7f1c9aca541ff2fa3bc8e5255a96 (patch) | |
tree | 062debc131dd02fc227e6db9626d349508264162 /backport/backport-include/linux/usb | |
parent | d49194bd038d1d9d9f4c3c321c7736bd0cd2a107 (diff) |
backports: update enum usb_device_speed with USB_SPEED_SUPER
USB_SPEED_SUPER is missing for kernel versions < 2.6.30 but used by uvc_video and
usbnet.
Signed-off-by: Patrick Ziegler <patrick.ziegler@fh-kl.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'backport/backport-include/linux/usb')
-rw-r--r-- | backport/backport-include/linux/usb/ch9.h | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/backport/backport-include/linux/usb/ch9.h b/backport/backport-include/linux/usb/ch9.h index 252a6f1f..40d5d3fa 100644 --- a/backport/backport-include/linux/usb/ch9.h +++ b/backport/backport-include/linux/usb/ch9.h @@ -1,9 +1,31 @@ #ifndef __BACKPORT__LINUX_USB_CH9_H #define __BACKPORT__LINUX_USB_CH9_H -#include_next <linux/usb/ch9.h> #include <linux/version.h> +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) +#define usb_device_speed old_usb_device_speed +#define USB_SPEED_UNKNOWN OLD_USB_SPEED_UNKNOWN +#define USB_SPEED_LOW OLD_USB_SPEED_LOW +#define USB_SPEED_FULL OLD_USB_SPEED_FULL +#define USB_SPEED_HIGH OLD_USB_SPEED_HIGH +#include_next <linux/usb/ch9.h> +#undef usb_device_speed +#undef USB_SPEED_UNKNOWN +#undef USB_SPEED_LOW +#undef USB_SPEED_FULL +#undef USB_SPEED_HIGH +enum usb_device_speed { + USB_SPEED_UNKNOWN = 0, /* enumerating */ + USB_SPEED_LOW, USB_SPEED_FULL, /* usb 1.1 */ + USB_SPEED_HIGH, /* usb 2.0 */ + USB_SPEED_WIRELESS, /* wireless (usb 2.5) */ + USB_SPEED_SUPER, /* usb 3.0 */ +}; +#else +#include_next <linux/usb/ch9.h> +#endif /* < 2.6.30 */ + #if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0) #include <linux/types.h> /* __u8 etc */ #include <asm/byteorder.h> /* le16_to_cpu */ |