diff options
| author |   David Vrabel <david.vrabel@csr.com> | 2010-02-25 13:35:22 +0000 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2010-02-25 13:35:22 +0000 |
| commit | 03806fa20f6a081493a731a4b18ea66317f9f947 (patch) | |
| tree | 630796c65c501e3612253ee4d4af58082a5f984c /drivers/usb/core/sysfs.c | |
| parent | uwb: declare MODULE_FIRMWARE() in i1480 DFU driver (diff) | |
| parent | security: fix error return path in ima_inode_alloc (diff) | |
| download | linux-dev-03806fa20f6a081493a731a4b18ea66317f9f947.tar.xz linux-dev-03806fa20f6a081493a731a4b18ea66317f9f947.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'drivers/usb/core/sysfs.c')
| -rw-r--r-- | drivers/usb/core/sysfs.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c index 485edf937f25..5f3908f6e2dc 100644 --- a/drivers/usb/core/sysfs.c +++ b/drivers/usb/core/sysfs.c @@ -115,6 +115,12 @@ show_speed(struct device *dev, struct device_attribute *attr, char *buf) case USB_SPEED_HIGH: speed = "480"; break; + case USB_SPEED_VARIABLE: + speed = "480"; + break; + case USB_SPEED_SUPER: + speed = "5000"; + break; default: speed = "unknown"; } |