From 887567c5acb35073232c75120a0fba56a05dd729 Mon Sep 17 00:00:00 2001
From: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Date: Sun, 13 Feb 2011 17:00:05 -0800
Subject: [PATCH] --- yaml --- r: 233426 b: refs/heads/master c:
 539c9aa5ba7c5f71794ef0948c6dd29552f033e4 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/net/stmmac/stmmac_main.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0bb5f361608b..50566d861a90 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da1ab3e233eb1ff4116b178006a89ddca7dcd928
+refs/heads/master: 539c9aa5ba7c5f71794ef0948c6dd29552f033e4
diff --git a/trunk/drivers/net/stmmac/stmmac_main.c b/trunk/drivers/net/stmmac/stmmac_main.c
index 34a0af3837f9..0e5f03135b50 100644
--- a/trunk/drivers/net/stmmac/stmmac_main.c
+++ b/trunk/drivers/net/stmmac/stmmac_main.c
@@ -1560,8 +1560,10 @@ static int stmmac_mac_device_setup(struct net_device *dev)
 
 	priv->hw = device;
 
-	if (device_can_wakeup(priv->device))
+	if (device_can_wakeup(priv->device)) {
 		priv->wolopts = WAKE_MAGIC; /* Magic Frame as default */
+		enable_irq_wake(dev->irq);
+	}
 
 	return 0;
 }