diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /drivers/usb/misc/phidgetmotorcontrol.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/usb/misc/phidgetmotorcontrol.c')
| -rw-r--r-- | drivers/usb/misc/phidgetmotorcontrol.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/misc/phidgetmotorcontrol.c b/drivers/usb/misc/phidgetmotorcontrol.c index 6b59b620d616..5c780cab92e0 100644 --- a/drivers/usb/misc/phidgetmotorcontrol.c +++ b/drivers/usb/misc/phidgetmotorcontrol.c | |||
| @@ -90,7 +90,7 @@ static int set_motor(struct motorcontrol *mc, int motor) | |||
| 90 | return retval < 0 ? retval : 0; | 90 | return retval < 0 ? retval : 0; |
| 91 | } | 91 | } |
| 92 | 92 | ||
| 93 | static void motorcontrol_irq(struct urb *urb, struct pt_regs *regs) | 93 | static void motorcontrol_irq(struct urb *urb) |
| 94 | { | 94 | { |
| 95 | struct motorcontrol *mc = urb->context; | 95 | struct motorcontrol *mc = urb->context; |
| 96 | unsigned char *buffer = mc->data; | 96 | unsigned char *buffer = mc->data; |