diff options
| author | David S. Miller <davem@davemloft.net> | 2009-01-30 17:31:07 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-30 17:31:07 -0500 |
| commit | 05bee4737774881e027bfd9a8b5c40a7d68f6325 (patch) | |
| tree | 5fd32eb8fe345d2d30e85910beac241a4439e8cd /drivers/net/r6040.c | |
| parent | 80595d59ba9917227856e663da249c2276a8628d (diff) | |
| parent | 905db44087855e3c1709f538ecdc22fd149cadd8 (diff) | |
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.c | 1 |
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) | |||
| 438 | { | 438 | { |
| 439 | struct r6040_private *lp = netdev_priv(dev); | 439 | struct r6040_private *lp = netdev_priv(dev); |
| 440 | void __iomem *ioaddr = lp->base; | 440 | void __iomem *ioaddr = lp->base; |
| 441 | struct pci_dev *pdev = lp->pdev; | ||
| 442 | int limit = 2048; | 441 | int limit = 2048; |
| 443 | u16 *adrp; | 442 | u16 *adrp; |
| 444 | u16 cmd; | 443 | u16 cmd; |