diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-06-05 23:25:01 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-06-05 23:25:01 +0300 |
| commit | 9f61f62544747db5d5c590bfae9dd19f1337e421 (patch) | |
| tree | 74772cccd14e7ab6d01a3452d4030cd7f8e58ccb /drivers/usb/gadget/udc/fusb300_udc.c | |
| parent | de8d1810fda5463ee60ba2937ca68e55a52bd9e7 (diff) | |
| parent | 086e8ddb567951513a5dace21a09297768aee14f (diff) | |
| download | linux-9f61f62544747db5d5c590bfae9dd19f1337e421.tar.xz | |
Merge branch 'linus' into irq/core
Get the urgent fixes from upstream to avoid conflicts.
Diffstat (limited to 'drivers/usb/gadget/udc/fusb300_udc.c')
| -rw-r--r-- | drivers/usb/gadget/udc/fusb300_udc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/udc/fusb300_udc.c b/drivers/usb/gadget/udc/fusb300_udc.c index fb4df159d32d..3970f453de49 100644 --- a/drivers/usb/gadget/udc/fusb300_udc.c +++ b/drivers/usb/gadget/udc/fusb300_udc.c @@ -1342,7 +1342,7 @@ static const struct usb_gadget_ops fusb300_gadget_ops = { .udc_stop = fusb300_udc_stop, }; -static int __exit fusb300_remove(struct platform_device *pdev) +static int fusb300_remove(struct platform_device *pdev) { struct fusb300 *fusb300 = platform_get_drvdata(pdev); @@ -1492,7 +1492,7 @@ clean_up: } static struct platform_driver fusb300_driver = { - .remove = __exit_p(fusb300_remove), + .remove = fusb300_remove, .driver = { .name = (char *) udc_name, }, |