diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 04:59:46 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 04:59:46 -0400 |
| commit | 701328a7b58d50d8640c21ba5fdf3170b1ddac16 (patch) | |
| tree | 99a3fe44310a97e92ad1cb3a01f2ee3f6ed0d59a /drivers/net/7990.c | |
| parent | 53e36ada37cb8b01cfbf674580a79edc0bb764c7 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/7990.c')
| -rw-r--r-- | drivers/net/7990.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/7990.c b/drivers/net/7990.c index 8e996b4a34ea..7733697f7776 100644 --- a/drivers/net/7990.c +++ b/drivers/net/7990.c | |||
| @@ -674,7 +674,7 @@ void lance_poll(struct net_device *dev) | |||
| 674 | WRITERAP(lp, LE_CSR0); | 674 | WRITERAP(lp, LE_CSR0); |
| 675 | WRITERDP(lp, LE_C0_STRT); | 675 | WRITERDP(lp, LE_C0_STRT); |
| 676 | spin_unlock (&lp->devlock); | 676 | spin_unlock (&lp->devlock); |
| 677 | lance_interrupt(dev->irq, dev, NULL); | 677 | lance_interrupt(dev->irq, dev); |
| 678 | } | 678 | } |
| 679 | #endif | 679 | #endif |
| 680 | 680 | ||