diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 01:16:41 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 01:16:41 -0500 |
| commit | 17eb9d62828c3688f41f31ac00d7fee6da9675bf (patch) | |
| tree | 03da91192242b6467d4f2d9d0b26f11f4da55c0c /drivers/usb/core/hcd.c | |
| parent | 76e7461a21dfe13565b2a323b53c8cc963541126 (diff) | |
| parent | f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5 (diff) | |
Merge branches 'sh/g3-prep' and 'sh/stable-updates'
Diffstat (limited to 'drivers/usb/core/hcd.c')
| -rw-r--r-- | drivers/usb/core/hcd.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 6dac3b802d41..0495fa651225 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c | |||
| @@ -1597,7 +1597,9 @@ rescan: | |||
| 1597 | } | 1597 | } |
| 1598 | 1598 | ||
| 1599 | /** | 1599 | /** |
| 1600 | * Check whether a new bandwidth setting exceeds the bus bandwidth. | 1600 | * usb_hcd_alloc_bandwidth - check whether a new bandwidth setting exceeds |
| 1601 | * the bus bandwidth | ||
| 1602 | * @udev: target &usb_device | ||
| 1601 | * @new_config: new configuration to install | 1603 | * @new_config: new configuration to install |
| 1602 | * @cur_alt: the current alternate interface setting | 1604 | * @cur_alt: the current alternate interface setting |
| 1603 | * @new_alt: alternate interface setting that is being installed | 1605 | * @new_alt: alternate interface setting that is being installed |