git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
[pandora-kernel.git]
/
drivers
/
usb
/
renesas_usbhs
/
mod_gadget.c
diff --git
a/drivers/usb/renesas_usbhs/mod_gadget.c
b/drivers/usb/renesas_usbhs/mod_gadget.c
index
4cc7ee0
..
d9717e0
100644
(file)
--- a/
drivers/usb/renesas_usbhs/mod_gadget.c
+++ b/
drivers/usb/renesas_usbhs/mod_gadget.c
@@
-830,7
+830,7
@@
static int usbhsg_stop(struct usbhs_priv *priv)
return usbhsg_try_stop(priv, USBHSG_STATUS_STARTED);
}
return usbhsg_try_stop(priv, USBHSG_STATUS_STARTED);
}
-int
__devinit
usbhs_mod_gadget_probe(struct usbhs_priv *priv)
+int usbhs_mod_gadget_probe(struct usbhs_priv *priv)
{
struct usbhsg_gpriv *gpriv;
struct usbhsg_uep *uep;
{
struct usbhsg_gpriv *gpriv;
struct usbhsg_uep *uep;
@@
-927,7
+927,7
@@
usbhs_mod_gadget_probe_err_gpriv:
return ret;
}
return ret;
}
-void
__devexit
usbhs_mod_gadget_remove(struct usbhs_priv *priv)
+void usbhs_mod_gadget_remove(struct usbhs_priv *priv)
{
struct usbhsg_gpriv *gpriv = usbhsg_priv_to_gpriv(priv);
{
struct usbhsg_gpriv *gpriv = usbhsg_priv_to_gpriv(priv);