diff --git a/[refs] b/[refs] index c1734016d8cd..ef6f4413e2fd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff85494b3f06a596a3f3b2f71841de0154799918 +refs/heads/master: 1b6c3b0fb242309bc77092be4a283513be115735 diff --git a/trunk/drivers/usb/musb/musb_gadget.c b/trunk/drivers/usb/musb/musb_gadget.c index 07d5dc97ff5e..c49b9ba025ab 100644 --- a/trunk/drivers/usb/musb/musb_gadget.c +++ b/trunk/drivers/usb/musb/musb_gadget.c @@ -1211,7 +1211,7 @@ static int musb_gadget_dequeue(struct usb_ep *ep, struct usb_request *request) * * exported to ep0 code */ -int musb_gadget_set_halt(struct usb_ep *ep, int value) +static int musb_gadget_set_halt(struct usb_ep *ep, int value) { struct musb_ep *musb_ep = to_musb_ep(ep); u8 epnum = musb_ep->current_epnum; @@ -1296,7 +1296,7 @@ int musb_gadget_set_halt(struct usb_ep *ep, int value) /* * Sets the halt feature with the clear requests ignored */ -int musb_gadget_set_wedge(struct usb_ep *ep) +static int musb_gadget_set_wedge(struct usb_ep *ep) { struct musb_ep *musb_ep = to_musb_ep(ep);