diff --git a/[refs] b/[refs] index 1059f79512af..e297b8402d2f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 71822faa3bc0af5dbf5e333a2d085f1ed7cd809f +refs/heads/master: 152abd139cca049c9b559a7cca762fa7fd9fd264 diff --git a/trunk/drivers/net/3c509.c b/trunk/drivers/net/3c509.c index 535c234286ea..8c694213035b 100644 --- a/trunk/drivers/net/3c509.c +++ b/trunk/drivers/net/3c509.c @@ -1475,6 +1475,7 @@ el3_resume(struct device *pdev) spin_lock_irqsave(&lp->lock, flags); outw(PowerUp, ioaddr + EL3_CMD); + EL3WINDOW(0); el3_up(dev); if (netif_running(dev))