diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /drivers/usb/atm/cxacru.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/usb/atm/cxacru.c')
| -rw-r--r-- | drivers/usb/atm/cxacru.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c index 04631dcbabbc..3892a9e9aee3 100644 --- a/drivers/usb/atm/cxacru.c +++ b/drivers/usb/atm/cxacru.c | |||
| @@ -171,7 +171,7 @@ struct cxacru_data { | |||
| 171 | }; | 171 | }; |
| 172 | 172 | ||
| 173 | /* the following three functions are stolen from drivers/usb/core/message.c */ | 173 | /* the following three functions are stolen from drivers/usb/core/message.c */ |
| 174 | static void cxacru_blocking_completion(struct urb *urb, struct pt_regs *regs) | 174 | static void cxacru_blocking_completion(struct urb *urb) |
| 175 | { | 175 | { |
| 176 | complete((struct completion *)urb->context); | 176 | complete((struct completion *)urb->context); |
| 177 | } | 177 | } |