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/8139cp.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/8139cp.c')
| -rw-r--r-- | drivers/net/8139cp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c index 934db350e339..6011d6fabef0 100644 --- a/drivers/net/8139cp.c +++ b/drivers/net/8139cp.c | |||
| @@ -1213,7 +1213,6 @@ static int cp_close (struct net_device *dev) | |||
| 1213 | 1213 | ||
| 1214 | spin_unlock_irqrestore(&cp->lock, flags); | 1214 | spin_unlock_irqrestore(&cp->lock, flags); |
| 1215 | 1215 | ||
| 1216 | synchronize_irq(dev->irq); | ||
| 1217 | free_irq(dev->irq, dev); | 1216 | free_irq(dev->irq, dev); |
| 1218 | 1217 | ||
| 1219 | cp_free_rings(cp); | 1218 | cp_free_rings(cp); |