diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:51:46 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:51:46 -0400 |
| commit | dbe1ab9514c231c9b062140a107d9dea0eabefcc (patch) | |
| tree | 0001c7143cf923fc704215f0a0e54221e9e5cbb9 /drivers/usb/core/usb.c | |
| parent | 612eff0e3715a6faff5ba1b74873b99e036c59fe (diff) | |
| parent | d588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/usb/core/usb.c')
| -rw-r--r-- | drivers/usb/core/usb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index b7fdc1cd134a..515310751303 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c | |||
| @@ -1207,6 +1207,7 @@ EXPORT_SYMBOL(usb_ifnum_to_if); | |||
| 1207 | EXPORT_SYMBOL(usb_altnum_to_altsetting); | 1207 | EXPORT_SYMBOL(usb_altnum_to_altsetting); |
| 1208 | 1208 | ||
| 1209 | EXPORT_SYMBOL(usb_reset_device); | 1209 | EXPORT_SYMBOL(usb_reset_device); |
| 1210 | EXPORT_SYMBOL(usb_reset_composite_device); | ||
| 1210 | 1211 | ||
| 1211 | EXPORT_SYMBOL(__usb_get_extra_descriptor); | 1212 | EXPORT_SYMBOL(__usb_get_extra_descriptor); |
| 1212 | 1213 | ||