diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/usb.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index c74cc64bddc8..3cc8db5254d1 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h | |||
@@ -497,7 +497,6 @@ extern int usb_lock_device_for_reset(struct usb_device *udev, | |||
497 | 497 | ||
498 | /* USB port reset for device reinitialization */ | 498 | /* USB port reset for device reinitialization */ |
499 | extern int usb_reset_device(struct usb_device *dev); | 499 | extern int usb_reset_device(struct usb_device *dev); |
500 | extern int usb_reset_composite_device(struct usb_device *dev); | ||
501 | 500 | ||
502 | extern struct usb_device *usb_find_device(u16 vendor_id, u16 product_id); | 501 | extern struct usb_device *usb_find_device(u16 vendor_id, u16 product_id); |
503 | 502 | ||
@@ -957,9 +956,9 @@ struct usbdrv_wrap { | |||
957 | * @resume: Called when the device is being resumed by the system. | 956 | * @resume: Called when the device is being resumed by the system. |
958 | * @reset_resume: Called when the suspended device has been reset instead | 957 | * @reset_resume: Called when the suspended device has been reset instead |
959 | * of being resumed. | 958 | * of being resumed. |
960 | * @pre_reset: Called by usb_reset_composite_device() when the device | 959 | * @pre_reset: Called by usb_reset_device() when the device |
961 | * is about to be reset. | 960 | * is about to be reset. |
962 | * @post_reset: Called by usb_reset_composite_device() after the device | 961 | * @post_reset: Called by usb_reset_device() after the device |
963 | * has been reset | 962 | * has been reset |
964 | * @id_table: USB drivers use ID table to support hotplugging. | 963 | * @id_table: USB drivers use ID table to support hotplugging. |
965 | * Export this with MODULE_DEVICE_TABLE(usb,...). This must be set | 964 | * Export this with MODULE_DEVICE_TABLE(usb,...). This must be set |