Merge branch 'linux-2.6'

1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index b07da1054add..e0489578945d 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -3594,7 +3594,9 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port,
         skge->duplex = -1;
         skge->speed = -1;
         skge->advertising = skge_supported_modes(hw);
-        skge->wol = pci_wake_enabled(hw->pdev) ? wol_supported(hw) : 0;
+
+        if (pci_wake_enabled(hw->pdev))
+                skge->wol = wol_supported(hw) & WAKE_MAGIC;
 
         hw->dev[port] = dev;