diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
| commit | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (patch) | |
| tree | 93824f573767da634fbc82c388b6d33cc454212b /drivers/usb/core/message.c | |
| parent | c1a26e7d40fb814716950122353a1a556844286b (diff) | |
| parent | 7d12e780e003f93433d49ce78cfedf4b4c52adc5 (diff) | |
Merge git://git.infradead.org/~dhowells/irq-2.6
* git://git.infradead.org/~dhowells/irq-2.6:
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
IRQ: Typedef the IRQ handler function type
IRQ: Typedef the IRQ flow handler function type
Diffstat (limited to 'drivers/usb/core/message.c')
| -rw-r--r-- | drivers/usb/core/message.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c index 85b1cd18336f..fccd1952bad3 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | #include "hcd.h" /* for usbcore internals */ | 17 | #include "hcd.h" /* for usbcore internals */ |
| 18 | #include "usb.h" | 18 | #include "usb.h" |
| 19 | 19 | ||
| 20 | static void usb_api_blocking_completion(struct urb *urb, struct pt_regs *regs) | 20 | static void usb_api_blocking_completion(struct urb *urb) |
| 21 | { | 21 | { |
| 22 | complete((struct completion *)urb->context); | 22 | complete((struct completion *)urb->context); |
| 23 | } | 23 | } |
| @@ -246,7 +246,7 @@ static void sg_clean (struct usb_sg_request *io) | |||
| 246 | io->dev = NULL; | 246 | io->dev = NULL; |
| 247 | } | 247 | } |
| 248 | 248 | ||
| 249 | static void sg_complete (struct urb *urb, struct pt_regs *regs) | 249 | static void sg_complete (struct urb *urb) |
| 250 | { | 250 | { |
| 251 | struct usb_sg_request *io = urb->context; | 251 | struct usb_sg_request *io = urb->context; |
| 252 | 252 | ||