aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/usb.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/usb.h')
-rw-r--r--include/linux/usb.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 99833029e5a8..e32a849f81ce 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -425,7 +425,6 @@ struct usb_tt;
425 * @connect_time: time device was first connected 425 * @connect_time: time device was first connected
426 * @do_remote_wakeup: remote wakeup should be enabled 426 * @do_remote_wakeup: remote wakeup should be enabled
427 * @reset_resume: needs reset instead of resume 427 * @reset_resume: needs reset instead of resume
428 * @autosuspend_disabled: autosuspend disabled by the user
429 * @wusb_dev: if this is a Wireless USB device, link to the WUSB 428 * @wusb_dev: if this is a Wireless USB device, link to the WUSB
430 * specific data for the device. 429 * specific data for the device.
431 * @slot_id: Slot ID assigned by xHCI 430 * @slot_id: Slot ID assigned by xHCI
@@ -501,7 +500,6 @@ struct usb_device {
501 500
502 unsigned do_remote_wakeup:1; 501 unsigned do_remote_wakeup:1;
503 unsigned reset_resume:1; 502 unsigned reset_resume:1;
504 unsigned autosuspend_disabled:1;
505#endif 503#endif
506 struct wusb_dev *wusb_dev; 504 struct wusb_dev *wusb_dev;
507 int slot_id; 505 int slot_id;
@@ -526,8 +524,8 @@ extern struct usb_device *usb_find_device(u16 vendor_id, u16 product_id);
526 524
527/* USB autosuspend and autoresume */ 525/* USB autosuspend and autoresume */
528#ifdef CONFIG_USB_SUSPEND 526#ifdef CONFIG_USB_SUSPEND
529extern int usb_enable_autosuspend(struct usb_device *udev); 527extern void usb_enable_autosuspend(struct usb_device *udev);
530extern int usb_disable_autosuspend(struct usb_device *udev); 528extern void usb_disable_autosuspend(struct usb_device *udev);
531 529
532extern int usb_autopm_get_interface(struct usb_interface *intf); 530extern int usb_autopm_get_interface(struct usb_interface *intf);
533extern void usb_autopm_put_interface(struct usb_interface *intf); 531extern void usb_autopm_put_interface(struct usb_interface *intf);