summaryrefslogtreecommitdiff
path: root/drivers/net/r6040.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-01-31 01:31:07 +0300
committerDavid S. Miller <davem@davemloft.net>2009-01-31 01:31:07 +0300
commit05bee4737774881e027bfd9a8b5c40a7d68f6325 (patch)
tree5fd32eb8fe345d2d30e85910beac241a4439e8cd /drivers/net/r6040.c
parent80595d59ba9917227856e663da249c2276a8628d (diff)
parent905db44087855e3c1709f538ecdc22fd149cadd8 (diff)
downloadlinux-05bee4737774881e027bfd9a8b5c40a7d68f6325.tar.xz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/e1000/e1000_main.c
Diffstat (limited to 'drivers/net/r6040.c')
-rw-r--r--drivers/net/r6040.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c
index cc0f886b0c29..3c27a7bfea49 100644
--- a/drivers/net/r6040.c
+++ b/drivers/net/r6040.c
@@ -438,7 +438,6 @@ static void r6040_down(struct net_device *dev)
{
struct r6040_private *lp = netdev_priv(dev);
void __iomem *ioaddr = lp->base;
- struct pci_dev *pdev = lp->pdev;
int limit = 2048;
u16 *adrp;
u16 cmd;