diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-10-06 05:03:43 +0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-10-06 05:03:43 +0400 |
commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
tree | d0536e4da737900fa27b235f175a3d179d692200 /drivers/usb/input/acecad.c | |
parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
download | linux-4ad99f15c6a3cadf36928c399459ea4fdb3d49f9.tar.xz |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/usb/input/acecad.c')
-rw-r--r-- | drivers/usb/input/acecad.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/input/acecad.c b/drivers/usb/input/acecad.c index d83603ba40ae..0096373b5f98 100644 --- a/drivers/usb/input/acecad.c +++ b/drivers/usb/input/acecad.c @@ -58,7 +58,7 @@ struct usb_acecad { dma_addr_t data_dma; }; -static void usb_acecad_irq(struct urb *urb, struct pt_regs *regs) +static void usb_acecad_irq(struct urb *urb) { struct usb_acecad *acecad = urb->context; unsigned char *data = acecad->data; |