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/net/asix.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/usb/net/asix.c')
| -rw-r--r-- | drivers/usb/net/asix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/net/asix.c b/drivers/usb/net/asix.c index 9c0eacf7055c..c73dd224aa76 100644 --- a/drivers/usb/net/asix.c +++ b/drivers/usb/net/asix.c | |||
| @@ -214,7 +214,7 @@ static int asix_write_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index, | |||
| 214 | USB_CTRL_SET_TIMEOUT); | 214 | USB_CTRL_SET_TIMEOUT); |
| 215 | } | 215 | } |
| 216 | 216 | ||
| 217 | static void asix_async_cmd_callback(struct urb *urb, struct pt_regs *regs) | 217 | static void asix_async_cmd_callback(struct urb *urb) |
| 218 | { | 218 | { |
| 219 | struct usb_ctrlrequest *req = (struct usb_ctrlrequest *)urb->context; | 219 | struct usb_ctrlrequest *req = (struct usb_ctrlrequest *)urb->context; |
| 220 | 220 | ||