Merge branch '20101221_static_const' of git://repo.or.cz/linux-2.6/trivial-mods

[mv-sheeva.git] / drivers / net / bnx2.c

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 819b55cbd492c777cf082de11ef94f3c4f93ffa4..6fa798468ad466f8459dcde37f26e96021e713b4 100644 (file)
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -8395,8 +8395,6 @@ bnx2_remove_one(struct pci_dev *pdev)
        struct net_device *dev = pci_get_drvdata(pdev);
        struct bnx2 *bp = netdev_priv(dev);
 
-       cancel_work_sync(&bp->reset_task);
-
        unregister_netdev(dev);
 
        if (bp->mips_firmware)