diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-29 00:28:46 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-29 00:28:46 -0400 |
| commit | 332e4af80d1214fbf0e263e1408fc7c5b64ecdd6 (patch) | |
| tree | 7c8f8ada7ab8fc9cb2497d95e52dce4d2c4493a3 /drivers/net/dl2k.c | |
| parent | 1b63ba8a86c85524a8d7e5953b314ce71ebcb9c9 (diff) | |
| parent | be0976be9148f31ee0d1997354c3e30ff8d07587 (diff) | |
Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/dl2k.c')
| -rw-r--r-- | drivers/net/dl2k.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c index 8277e89e552d..f8037110a522 100644 --- a/drivers/net/dl2k.c +++ b/drivers/net/dl2k.c | |||
| @@ -1753,7 +1753,7 @@ rio_close (struct net_device *dev) | |||
| 1753 | 1753 | ||
| 1754 | /* Stop Tx and Rx logics */ | 1754 | /* Stop Tx and Rx logics */ |
| 1755 | writel (TxDisable | RxDisable | StatsDisable, ioaddr + MACCtrl); | 1755 | writel (TxDisable | RxDisable | StatsDisable, ioaddr + MACCtrl); |
| 1756 | synchronize_irq (dev->irq); | 1756 | |
| 1757 | free_irq (dev->irq, dev); | 1757 | free_irq (dev->irq, dev); |
| 1758 | del_timer_sync (&np->timer); | 1758 | del_timer_sync (&np->timer); |
| 1759 | 1759 | ||