diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-02-03 10:19:23 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-02-03 10:19:23 -0500 |
| commit | e1f81c8a417be466e85a38b61679aa6860ec7331 (patch) | |
| tree | 749815f74bfad330e83560a10fd5da5fc4d8c765 /drivers/net/r6040.c | |
| parent | 0e2bedaa394f74fa9f75ee937488c33d90039b5a (diff) | |
| parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
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 72fd9e97c190..b2dcdb5ed8bd 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; |