diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/usb/gadget/pxa27x_udc.c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/usb/gadget/pxa27x_udc.c')
| -rw-r--r-- | drivers/usb/gadget/pxa27x_udc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c index 1937d8c7b433..adda1208a1ec 100644 --- a/drivers/usb/gadget/pxa27x_udc.c +++ b/drivers/usb/gadget/pxa27x_udc.c | |||
| @@ -1524,7 +1524,7 @@ static int pxa_udc_get_frame(struct usb_gadget *_gadget) | |||
| 1524 | * pxa_udc_wakeup - Force udc device out of suspend | 1524 | * pxa_udc_wakeup - Force udc device out of suspend |
| 1525 | * @_gadget: usb gadget | 1525 | * @_gadget: usb gadget |
| 1526 | * | 1526 | * |
| 1527 | * Returns 0 if succesfull, error code otherwise | 1527 | * Returns 0 if successfull, error code otherwise |
| 1528 | */ | 1528 | */ |
| 1529 | static int pxa_udc_wakeup(struct usb_gadget *_gadget) | 1529 | static int pxa_udc_wakeup(struct usb_gadget *_gadget) |
| 1530 | { | 1530 | { |