diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-10-06 03:03:43 +0200 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-10-06 03:03:43 +0200 |
commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
tree | d0536e4da737900fa27b235f175a3d179d692200 /drivers/usb/net/net1080.c | |
parent | [PATCH] libata: Don't believe bogus claims in the older PIO mode register (diff) | |
parent | Merge git://git.infradead.org/~dhowells/irq-2.6 (diff) | |
download | linux-4ad99f15c6a3cadf36928c399459ea4fdb3d49f9.tar.xz linux-4ad99f15c6a3cadf36928c399459ea4fdb3d49f9.zip |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/usb/net/net1080.c')
-rw-r--r-- | drivers/usb/net/net1080.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/net/net1080.c b/drivers/usb/net/net1080.c index 301baa72bac7..ce00de8f13a1 100644 --- a/drivers/usb/net/net1080.c +++ b/drivers/usb/net/net1080.c @@ -368,7 +368,7 @@ static int net1080_check_connect(struct usbnet *dev) return 0; } -static void nc_flush_complete(struct urb *urb, struct pt_regs *regs) +static void nc_flush_complete(struct urb *urb) { kfree(urb->context); usb_free_urb(urb); |