diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-04-25 16:20:10 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-25 16:20:10 -0400 |
| commit | 404e86e1550cc2c84bb57a372af784585c732f9a (patch) | |
| tree | c0e8e2d61c1b1c79705c0dc9f0f16e35267286e4 /drivers/usb/atm/cxacru.c | |
| parent | 0206e61b467fde4d7b50f1a64355182a4fd9576b (diff) | |
| parent | b9fa38f75ea7e1f64bc29653ca9758303ce698e4 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
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 a51eeedc18d4..d470c72b737e 100644 --- a/drivers/usb/atm/cxacru.c +++ b/drivers/usb/atm/cxacru.c | |||
| @@ -444,7 +444,7 @@ CXACRU_ALL_FILES(INIT); | |||
| 444 | /* the following three functions are stolen from drivers/usb/core/message.c */ | 444 | /* the following three functions are stolen from drivers/usb/core/message.c */ |
| 445 | static void cxacru_blocking_completion(struct urb *urb) | 445 | static void cxacru_blocking_completion(struct urb *urb) |
| 446 | { | 446 | { |
| 447 | complete((struct completion *)urb->context); | 447 | complete(urb->context); |
| 448 | } | 448 | } |
| 449 | 449 | ||
| 450 | static void cxacru_timeout_kill(unsigned long data) | 450 | static void cxacru_timeout_kill(unsigned long data) |