diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-02-15 17:25:26 -0800 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-02-16 14:25:43 -0800 |
| commit | fbef790a66d87fc2a579c38f821652a11df0fcb9 (patch) | |
| tree | a77d9dbd2b380fe743bc4fc4eed060421eefab4d | |
| parent | b24a032321d9d95b1181558a4dc757d5751673aa (diff) | |
merge: USB: remove duplicated usb_hcd_map_urb_for_dma
The original commit went upstream, this is to fix a merge issue from a
slightly different version coming back.
Change-Id: I69a58a483e58a0ee1a13521a466709f5cad6505f
Reviewed-on: http://git-master/r/19663
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
Tested-by: Daniel Willemsen <dwillemsen@nvidia.com>
Reviewed-by: Robert Morell <rmorell@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Nitin Kumbhar <nkumbhar@nvidia.com>
| -rw-r--r-- | include/linux/usb/hcd.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h index 8a53d3db4fd5..6e1b7507e103 100644 --- a/include/linux/usb/hcd.h +++ b/include/linux/usb/hcd.h @@ -340,9 +340,6 @@ extern void usb_hcd_unlink_urb_from_ep(struct usb_hcd *hcd, struct urb *urb); extern int usb_hcd_submit_urb(struct urb *urb, gfp_t mem_flags); extern int usb_hcd_unlink_urb(struct urb *urb, int status); -extern int usb_hcd_map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb, - gfp_t mem_flags); -extern void usb_hcd_unmap_urb_for_dma(struct usb_hcd *hcd, struct urb *urb); extern void usb_hcd_giveback_urb(struct usb_hcd *hcd, struct urb *urb, int status); extern int usb_hcd_map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb, |