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/phidgetkit.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/usb/misc/phidgetkit.c')
| -rw-r--r-- | drivers/usb/misc/phidgetkit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/misc/phidgetkit.c b/drivers/usb/misc/phidgetkit.c index 78e419904abf..abb4dcd811ac 100644 --- a/drivers/usb/misc/phidgetkit.c +++ b/drivers/usb/misc/phidgetkit.c | |||
| @@ -300,7 +300,7 @@ out: | |||
| 300 | 300 | ||
| 301 | static DEVICE_ATTR(lcd, S_IWUGO, NULL, enable_lcd_files); | 301 | static DEVICE_ATTR(lcd, S_IWUGO, NULL, enable_lcd_files); |
| 302 | 302 | ||
| 303 | static void interfacekit_irq(struct urb *urb, struct pt_regs *regs) | 303 | static void interfacekit_irq(struct urb *urb) |
| 304 | { | 304 | { |
| 305 | struct interfacekit *kit = urb->context; | 305 | struct interfacekit *kit = urb->context; |
| 306 | unsigned char *buffer = kit->data; | 306 | unsigned char *buffer = kit->data; |