diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 22:31:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 22:31:54 -0400 |
| commit | 4fa4d23fa20de67df919030c1216295664866ad7 (patch) | |
| tree | 90e80f8a40665a351950ef25ab9de85b3647a23a /drivers/net/3c59x.c | |
| parent | a9e82d3a02247af6b729be0a963862d70cb25bf9 (diff) | |
| parent | 4f1e5ba0977570b7a198bb3ac110ccc5f532821b (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
pcnet32: remove private net_device_stats structure
vortex_up should initialize "err"
pcnet32: remove compile warnings in non-napi mode
pcnet32: fix non-napi packet reception
fix EMAC driver for proper napi_synchronize API
sky2: shutdown cleanup
napi_synchronize: waiting for NAPI
forcedeth msi bugfix
gianfar: fix obviously wrong #ifdef CONFIG_GFAR_NAPI placement
fs_enet: Update for API changes
gianfar: remove orphan struct.
forcedeth: fix rx-work condition in nv_rx_process_optimized() too
Diffstat (limited to 'drivers/net/3c59x.c')
| -rw-r--r-- | drivers/net/3c59x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c index 862f47223fdc..6f8e7d4cf74d 100644 --- a/drivers/net/3c59x.c +++ b/drivers/net/3c59x.c | |||
| @@ -1491,7 +1491,7 @@ vortex_up(struct net_device *dev) | |||
| 1491 | struct vortex_private *vp = netdev_priv(dev); | 1491 | struct vortex_private *vp = netdev_priv(dev); |
| 1492 | void __iomem *ioaddr = vp->ioaddr; | 1492 | void __iomem *ioaddr = vp->ioaddr; |
| 1493 | unsigned int config; | 1493 | unsigned int config; |
| 1494 | int i, mii_reg1, mii_reg5, err; | 1494 | int i, mii_reg1, mii_reg5, err = 0; |
| 1495 | 1495 | ||
| 1496 | if (VORTEX_PCI(vp)) { | 1496 | if (VORTEX_PCI(vp)) { |
| 1497 | pci_set_power_state(VORTEX_PCI(vp), PCI_D0); /* Go active */ | 1497 | pci_set_power_state(VORTEX_PCI(vp), PCI_D0); /* Go active */ |