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/misc/ldusb.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/misc/ldusb.c')
-rw-r--r-- | drivers/usb/misc/ldusb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/misc/ldusb.c b/drivers/usb/misc/ldusb.c index 10b640339d8d..788a11e6772f 100644 --- a/drivers/usb/misc/ldusb.c +++ b/drivers/usb/misc/ldusb.c | |||
@@ -212,7 +212,7 @@ static void ld_usb_delete(struct ld_usb *dev) | |||
212 | /** | 212 | /** |
213 | * ld_usb_interrupt_in_callback | 213 | * ld_usb_interrupt_in_callback |
214 | */ | 214 | */ |
215 | static void ld_usb_interrupt_in_callback(struct urb *urb, struct pt_regs *regs) | 215 | static void ld_usb_interrupt_in_callback(struct urb *urb) |
216 | { | 216 | { |
217 | struct ld_usb *dev = urb->context; | 217 | struct ld_usb *dev = urb->context; |
218 | size_t *actual_buffer; | 218 | size_t *actual_buffer; |
@@ -264,7 +264,7 @@ exit: | |||
264 | /** | 264 | /** |
265 | * ld_usb_interrupt_out_callback | 265 | * ld_usb_interrupt_out_callback |
266 | */ | 266 | */ |
267 | static void ld_usb_interrupt_out_callback(struct urb *urb, struct pt_regs *regs) | 267 | static void ld_usb_interrupt_out_callback(struct urb *urb) |
268 | { | 268 | { |
269 | struct ld_usb *dev = urb->context; | 269 | struct ld_usb *dev = urb->context; |
270 | 270 | ||