Merge tag 'usb-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[linux-2.6-block.git] / drivers / usb / core / usb.h

diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h
index 0923add72b59e5cddd5458085b58054b35deab86..75bf649da82d58198f38752874f39a00e726065e 100644 (file)
--- a/drivers/usb/core/usb.h
+++ b/drivers/usb/core/usb.h
@@ -2,7 +2,7 @@
 #include <linux/acpi.h>
 
 struct usb_hub_descriptor;
-struct dev_state;
+struct usb_dev_state;
 
 /* Functions local to drivers/usb/core/ */
 
@@ -57,12 +57,8 @@ extern int usb_match_device(struct usb_device *dev,
 extern void usb_forced_unbind_intf(struct usb_interface *intf);
 extern void usb_unbind_and_rebind_marked_interfaces(struct usb_device *udev);
 
-extern int usb_hub_claim_port(struct usb_device *hdev, unsigned port,
-               struct dev_state *owner);
-extern int usb_hub_release_port(struct usb_device *hdev, unsigned port,
-               struct dev_state *owner);
 extern void usb_hub_release_all_ports(struct usb_device *hdev,
-               struct dev_state *owner);
+               struct usb_dev_state *owner);
 extern bool usb_device_is_owned(struct usb_device *udev);
 
 extern int  usb_hub_init(void);