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/misc/ldusb.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
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 | ||