diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 11:56:12 +0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 11:56:12 +0400 |
commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /drivers/usb/input/acecad.c | |
parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
download | linux-24fcbacedb0d83cabc6761acbecfbf751265ce52.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; |