Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 174953
b: refs/heads/master
c: 915c8be
h: refs/heads/master
i:
  174951: 4696608
v: v3
  • Loading branch information
Michal Nazarewicz authored and Greg Kroah-Hartman committed Dec 11, 2009
1 parent b4e1c16 commit 661fe84
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8ea864cffdfd327117d4b7829935974b3f47ff31
refs/heads/master: 915c8befccbe5d81d441b53ab7a9a98caf0c67d4
5 changes: 3 additions & 2 deletions trunk/drivers/usb/gadget/composite.c
Original file line number Diff line number Diff line change
Expand Up @@ -1092,7 +1092,8 @@ static struct usb_gadget_driver composite_driver = {
.speed = USB_SPEED_HIGH,

.bind = composite_bind,
.unbind = __exit_p(composite_unbind),
/* .unbind = __exit_p(composite_unbind), */
.unbind = composite_unbind,

.setup = composite_setup,
.disconnect = composite_disconnect,
Expand Down Expand Up @@ -1141,7 +1142,7 @@ int __init usb_composite_register(struct usb_composite_driver *driver)
* This function is used to unregister drivers using the composite
* driver framework.
*/
void __exit usb_composite_unregister(struct usb_composite_driver *driver)
void /* __exit */ usb_composite_unregister(struct usb_composite_driver *driver)
{
if (composite != driver)
return;
Expand Down

0 comments on commit 661fe84

Please sign in to comment.