diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-11-12 01:29:34 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-11-12 08:53:30 +0100 |
| commit | 51b44eb17b8ec6c83eac7772b4c8bc5887c5fbf7 (patch) | |
| tree | 4125e1888cbc215ec4a365457505a407f48e5232 /drivers/usb/dwc3/gadget.h | |
| parent | drm/mode: document path property and function to set it. (v1.1) (diff) | |
| parent | Linux 3.18-rc4 (diff) | |
| download | linux-51b44eb17b8ec6c83eac7772b4c8bc5887c5fbf7.tar.xz linux-51b44eb17b8ec6c83eac7772b4c8bc5887c5fbf7.zip | |
Merge tag 'v3.18-rc4' into drm-next
backmerge to get vmwgfx locking changes into next as the
conflict with per-plane locking.
Diffstat (limited to 'drivers/usb/dwc3/gadget.h')
| -rw-r--r-- | drivers/usb/dwc3/gadget.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/dwc3/gadget.h b/drivers/usb/dwc3/gadget.h index 178ad8982206..18ae3eaa8b6f 100644 --- a/drivers/usb/dwc3/gadget.h +++ b/drivers/usb/dwc3/gadget.h @@ -82,10 +82,11 @@ void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req, void dwc3_ep0_interrupt(struct dwc3 *dwc, const struct dwc3_event_depevt *event); void dwc3_ep0_out_start(struct dwc3 *dwc); +int __dwc3_gadget_ep0_set_halt(struct usb_ep *ep, int value); int dwc3_gadget_ep0_set_halt(struct usb_ep *ep, int value); int dwc3_gadget_ep0_queue(struct usb_ep *ep, struct usb_request *request, gfp_t gfp_flags); -int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value); +int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value, int protocol); /** * dwc3_gadget_ep_get_transfer_index - Gets transfer index from HW |