diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 00:58:59 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 00:58:59 -0500 |
| commit | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (patch) | |
| tree | 73cd85e5529a01fa2338ab6d58b99c36dd666cbe /drivers/usb | |
| parent | ddef9bb367b19383df627e388cb4c01c86ddba6c (diff) | |
| parent | 0bdd340c092b0936f78a54bdbd3927463ed4fca3 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/core/driver.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c index 076462c8ba2a..dce9d987f0fc 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c | |||
| @@ -378,7 +378,7 @@ const struct usb_device_id *usb_match_id(struct usb_interface *interface, | |||
| 378 | 378 | ||
| 379 | return NULL; | 379 | return NULL; |
| 380 | } | 380 | } |
| 381 | EXPORT_SYMBOL_GPL(usb_match_id); | 381 | EXPORT_SYMBOL(usb_match_id); |
| 382 | 382 | ||
| 383 | int usb_device_match(struct device *dev, struct device_driver *drv) | 383 | int usb_device_match(struct device *dev, struct device_driver *drv) |
| 384 | { | 384 | { |
| @@ -446,7 +446,7 @@ int usb_register_driver(struct usb_driver *new_driver, struct module *owner) | |||
| 446 | 446 | ||
| 447 | return retval; | 447 | return retval; |
| 448 | } | 448 | } |
| 449 | EXPORT_SYMBOL_GPL(usb_register_driver); | 449 | EXPORT_SYMBOL(usb_register_driver); |
| 450 | 450 | ||
| 451 | /** | 451 | /** |
| 452 | * usb_deregister - unregister a USB driver | 452 | * usb_deregister - unregister a USB driver |
| @@ -469,4 +469,4 @@ void usb_deregister(struct usb_driver *driver) | |||
| 469 | 469 | ||
| 470 | usbfs_update_special(); | 470 | usbfs_update_special(); |
| 471 | } | 471 | } |
| 472 | EXPORT_SYMBOL_GPL(usb_deregister); | 472 | EXPORT_SYMBOL(usb_deregister); |