projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[GFS2] Fix up merge of Linus' kernel into GFS2
[powerpc.git]
/
include
/
linux
/
usb_gadget.h
diff --git
a/include/linux/usb_gadget.h
b/include/linux/usb_gadget.h
index
1d78870
..
e17186d
100644
(file)
--- a/
include/linux/usb_gadget.h
+++ b/
include/linux/usb_gadget.h
@@
-872,9
+872,9
@@
int usb_gadget_config_buf(const struct usb_config_descriptor *config,
/* utility wrapping a simple endpoint selection policy */
extern struct usb_ep *usb_ep_autoconfig (struct usb_gadget *,
/* utility wrapping a simple endpoint selection policy */
extern struct usb_ep *usb_ep_autoconfig (struct usb_gadget *,
- struct usb_endpoint_descriptor *) __init;
+ struct usb_endpoint_descriptor *) __
dev
init;
-extern void usb_ep_autoconfig_reset (struct usb_gadget *) __init;
+extern void usb_ep_autoconfig_reset (struct usb_gadget *) __
dev
init;
#endif /* __KERNEL__ */
#endif /* __KERNEL__ */