diff options
| author | James Morris <jmorris@namei.org> | 2009-03-23 19:52:46 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-03-23 19:52:46 -0400 |
| commit | 703a3cd72817e99201cef84a8a7aecc60b2b3581 (patch) | |
| tree | 3e943755178ff410694722bb031f523136fbc432 /drivers/net/3c509.c | |
| parent | df7f54c012b92ec93d56b68547351dcdf8a163d3 (diff) | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/net/3c509.c')
| -rw-r--r-- | drivers/net/3c509.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c index 535c234286ea..8c694213035b 100644 --- a/drivers/net/3c509.c +++ b/drivers/net/3c509.c | |||
| @@ -1475,6 +1475,7 @@ el3_resume(struct device *pdev) | |||
| 1475 | spin_lock_irqsave(&lp->lock, flags); | 1475 | spin_lock_irqsave(&lp->lock, flags); |
| 1476 | 1476 | ||
| 1477 | outw(PowerUp, ioaddr + EL3_CMD); | 1477 | outw(PowerUp, ioaddr + EL3_CMD); |
| 1478 | EL3WINDOW(0); | ||
| 1478 | el3_up(dev); | 1479 | el3_up(dev); |
| 1479 | 1480 | ||
| 1480 | if (netif_running(dev)) | 1481 | if (netif_running(dev)) |