diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 12:25:16 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 12:25:16 -0400 |
commit | be90a49ca22a95f184d9f32d35b5247b44032849 (patch) | |
tree | d3c2edc18c003c384366f57901616ac29c80bc27 /drivers/usb/core/usb.h | |
parent | 1f0918d03ff4b5c94540c71ce889672abdbc2f4a (diff) | |
parent | a87371b477774b290c27bc5cb7f4ccc5379574a9 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (142 commits)
USB: Fix sysfs paths in documentation
USB: skeleton: fix coding style issues.
USB: O_NONBLOCK in read path of skeleton
USB: make usb-skeleton honor O_NONBLOCK in write path
USB: skel_read really sucks royally
USB: Add hub descriptor update hook for xHCI
USB: xhci: Support USB hubs.
USB: xhci: Set multi-TT field for LS/FS devices under hubs.
USB: xhci: Set route string for all devices.
USB: xhci: Fix command wait list handling.
USB: xhci: Change how xHCI commands are handled.
USB: xhci: Refactor input device context setup.
USB: xhci: Endpoint representation refactoring.
USB: gadget: ether needs to select CRC32
USB: fix USBTMC get_capabilities success handling
USB: fix missing error check in probing
USB: usbfs: add USBDEVFS_URB_BULK_CONTINUATION flag
USB: support for autosuspend in sierra while online
USB: ehci-dbgp,ehci: Allow dbpg to work with suspend/resume
USB: ehci-dbgp,documentation: Documentation updates for ehci-dbgp
...
Diffstat (limited to 'drivers/usb/core/usb.h')
-rw-r--r-- | drivers/usb/core/usb.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h index c0e0ae2bb8e7..9a8b15e6377a 100644 --- a/drivers/usb/core/usb.h +++ b/drivers/usb/core/usb.h | |||
@@ -37,6 +37,13 @@ extern int usb_match_device(struct usb_device *dev, | |||
37 | extern void usb_forced_unbind_intf(struct usb_interface *intf); | 37 | extern void usb_forced_unbind_intf(struct usb_interface *intf); |
38 | extern void usb_rebind_intf(struct usb_interface *intf); | 38 | extern void usb_rebind_intf(struct usb_interface *intf); |
39 | 39 | ||
40 | extern int usb_hub_claim_port(struct usb_device *hdev, unsigned port, | ||
41 | void *owner); | ||
42 | extern int usb_hub_release_port(struct usb_device *hdev, unsigned port, | ||
43 | void *owner); | ||
44 | extern void usb_hub_release_all_ports(struct usb_device *hdev, void *owner); | ||
45 | extern bool usb_device_is_owned(struct usb_device *udev); | ||
46 | |||
40 | extern int usb_hub_init(void); | 47 | extern int usb_hub_init(void); |
41 | extern void usb_hub_cleanup(void); | 48 | extern void usb_hub_cleanup(void); |
42 | extern int usb_major_init(void); | 49 | extern int usb_major_init(void); |