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/uwb/i1480/dfu/usb.c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/uwb/i1480/dfu/usb.c')
| -rw-r--r-- | drivers/uwb/i1480/dfu/usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/uwb/i1480/dfu/usb.c b/drivers/uwb/i1480/dfu/usb.c index c7080d497311..0bb665a0c024 100644 --- a/drivers/uwb/i1480/dfu/usb.c +++ b/drivers/uwb/i1480/dfu/usb.c | |||
| @@ -229,7 +229,7 @@ void i1480_usb_neep_cb(struct urb *urb) | |||
| 229 | * will verify it. | 229 | * will verify it. |
| 230 | * | 230 | * |
| 231 | * Set i1480->evt_result with the result of getting the event or its | 231 | * Set i1480->evt_result with the result of getting the event or its |
| 232 | * size (if succesful). | 232 | * size (if successful). |
| 233 | * | 233 | * |
| 234 | * Delivers the data directly to i1480->evt_buf | 234 | * Delivers the data directly to i1480->evt_buf |
| 235 | */ | 235 | */ |