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/adutux.c | |
parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (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 | ||