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/adutux.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/usb/misc/adutux.c')
| -rw-r--r-- | drivers/usb/misc/adutux.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/misc/adutux.c b/drivers/usb/misc/adutux.c index d3963199b6ec..aecd633fe9f6 100644 --- a/drivers/usb/misc/adutux.c +++ b/drivers/usb/misc/adutux.c | |||
| @@ -177,7 +177,7 @@ static void adu_delete(struct adu_device *dev) | |||
| 177 | dbg(2, "%s : leave", __FUNCTION__); | 177 | dbg(2, "%s : leave", __FUNCTION__); |
| 178 | } | 178 | } |
| 179 | 179 | ||
| 180 | static void adu_interrupt_in_callback(struct urb *urb, struct pt_regs *regs) | 180 | static void adu_interrupt_in_callback(struct urb *urb) |
| 181 | { | 181 | { |
| 182 | struct adu_device *dev = urb->context; | 182 | struct adu_device *dev = urb->context; |
| 183 | 183 | ||
| @@ -221,7 +221,7 @@ exit: | |||
| 221 | dbg(4," %s : leave, status %d", __FUNCTION__, urb->status); | 221 | dbg(4," %s : leave, status %d", __FUNCTION__, urb->status); |
| 222 | } | 222 | } |
| 223 | 223 | ||
| 224 | static void adu_interrupt_out_callback(struct urb *urb, struct pt_regs *regs) | 224 | static void adu_interrupt_out_callback(struct urb *urb) |
| 225 | { | 225 | { |
| 226 | struct adu_device *dev = urb->context; | 226 | struct adu_device *dev = urb->context; |
| 227 | 227 | ||