aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/3c509.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-02-07 05:52:44 -0500
committerDavid S. Miller <davem@davemloft.net>2009-02-07 05:52:44 -0500
commit409f0a9014fe24d906ba21aaccff80eb7f7304da (patch)
tree8d9a6946d6cf1c5aab72651a193ff860651e5e65 /drivers/net/3c509.c
parent593721833d2a3987736467144ad062a709d3a72c (diff)
parent0b492fce3d72d982a7981905f85484a1e1ba7fde (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/wireless/iwlwifi/iwl-agn.c drivers/net/wireless/iwlwifi/iwl3945-base.c
Diffstat (limited to 'drivers/net/3c509.c')
-rw-r--r--drivers/net/3c509.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c
index d58919c7032e..fbb371921991 100644
--- a/drivers/net/3c509.c
+++ b/drivers/net/3c509.c
@@ -1482,6 +1482,7 @@ el3_resume(struct device *pdev)
1482 spin_lock_irqsave(&lp->lock, flags); 1482 spin_lock_irqsave(&lp->lock, flags);
1483 1483
1484 outw(PowerUp, ioaddr + EL3_CMD); 1484 outw(PowerUp, ioaddr + EL3_CMD);
1485 EL3WINDOW(0);
1485 el3_up(dev); 1486 el3_up(dev);
1486 1487
1487 if (netif_running(dev)) 1488 if (netif_running(dev))