Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / drivers / usb / gadget / udc / omap_udc.c

diff --git a/drivers/usb/gadget/udc/omap_udc.c b/drivers/usb/gadget/udc/omap_udc.c
index 81a9aa3..288c087 100644 (file)
--- a/drivers/usb/gadget/udc/omap_udc.c
+++ b/drivers/usb/gadget/udc/omap_udc.c
@@ -1311,8 +1311,7 @@ static int omap_pullup(struct usb_gadget *gadget, int is_on)
 
 static int omap_udc_start(struct usb_gadget *g,
                struct usb_gadget_driver *driver);
-static int omap_udc_stop(struct usb_gadget *g,
-               struct usb_gadget_driver *driver);
+static int omap_udc_stop(struct usb_gadget *g);
 
 static const struct usb_gadget_ops omap_gadget_ops = {
        .get_frame              = omap_get_frame,
@@ -2102,8 +2101,7 @@ done:
        return status;
 }
 
-static int omap_udc_stop(struct usb_gadget *g,
-               struct usb_gadget_driver *driver)
+static int omap_udc_stop(struct usb_gadget *g)
 {
        unsigned long   flags;
        int             status = -ENODEV;