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/pci-skeleton.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/pci-skeleton.c')
| -rw-r--r-- | drivers/net/pci-skeleton.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c index fffc49befe04..53451c3b2c0d 100644 --- a/drivers/net/pci-skeleton.c +++ b/drivers/net/pci-skeleton.c | |||
| @@ -1739,7 +1739,6 @@ static int netdrv_close (struct net_device *dev) | |||
| 1739 | 1739 | ||
| 1740 | spin_unlock_irqrestore (&tp->lock, flags); | 1740 | spin_unlock_irqrestore (&tp->lock, flags); |
| 1741 | 1741 | ||
| 1742 | synchronize_irq (dev->irq); | ||
| 1743 | free_irq (dev->irq, dev); | 1742 | free_irq (dev->irq, dev); |
| 1744 | 1743 | ||
| 1745 | netdrv_tx_clear (dev); | 1744 | netdrv_tx_clear (dev); |