From c901e0d3a5ce37ce68a64765210f57f8a75510bc Mon Sep 17 00:00:00 2001
From: Devendra Naga <devendra.aaru@gmail.com>
Date: Fri, 6 Jul 2012 20:07:35 +0000
Subject: [PATCH] --- yaml --- r: 315003 b: refs/heads/master c:
 8ce5c9f27d2e2ce415d903d916e848a356d4c0c0 h: refs/heads/master i:   315001:
 f04303a31e47e2981a7512e831ede2941ae3c2bf   314999:
 96da5e253024d48762b6ca0ae0c105203cfb6d48 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/net/ethernet/rdc/r6040.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e1e7201f4090..ab218dd9774c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c56bf6fe785abbd83751a462f0c7067f7145b97a
+refs/heads/master: 8ce5c9f27d2e2ce415d903d916e848a356d4c0c0
diff --git a/trunk/drivers/net/ethernet/rdc/r6040.c b/trunk/drivers/net/ethernet/rdc/r6040.c
index d1827e887f4e..9acc026f62e8 100644
--- a/trunk/drivers/net/ethernet/rdc/r6040.c
+++ b/trunk/drivers/net/ethernet/rdc/r6040.c
@@ -1256,7 +1256,6 @@ static void __devexit r6040_remove_one(struct pci_dev *pdev)
 	kfree(lp->mii_bus->irq);
 	mdiobus_free(lp->mii_bus);
 	netif_napi_del(&lp->napi);
-	pci_set_drvdata(pdev, NULL);
 	pci_iounmap(pdev, lp->base);
 	pci_release_regions(pdev);
 	free_netdev(dev);