git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[sfrench/cifs-2.6.git]
/
drivers
/
usb
/
gadget
/
udc
/
atmel_usba_udc.c
diff --git
a/drivers/usb/gadget/udc/atmel_usba_udc.c
b/drivers/usb/gadget/udc/atmel_usba_udc.c
index 4c01953a0869cf67693ec2842d48b508770927a2..351d48550c332af0768e43912f0d21069fbf8ea4 100644
(file)
--- a/
drivers/usb/gadget/udc/atmel_usba_udc.c
+++ b/
drivers/usb/gadget/udc/atmel_usba_udc.c
@@
-2186,7
+2186,7
@@
static int usba_udc_probe(struct platform_device *pdev)
return 0;
}
return 0;
}
-static int
__exit
usba_udc_remove(struct platform_device *pdev)
+static int usba_udc_remove(struct platform_device *pdev)
{
struct usba_udc *udc;
int i;
{
struct usba_udc *udc;
int i;
@@
-2258,7
+2258,7
@@
static int usba_udc_resume(struct device *dev)
static SIMPLE_DEV_PM_OPS(usba_udc_pm_ops, usba_udc_suspend, usba_udc_resume);
static struct platform_driver udc_driver = {
static SIMPLE_DEV_PM_OPS(usba_udc_pm_ops, usba_udc_suspend, usba_udc_resume);
static struct platform_driver udc_driver = {
- .remove =
__exit_p(usba_udc_remove)
,
+ .remove =
usba_udc_remove
,
.driver = {
.name = "atmel_usba_udc",
.pm = &usba_udc_pm_ops,
.driver = {
.name = "atmel_usba_udc",
.pm = &usba_udc_pm_ops,