diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-04 13:58:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-04 13:58:28 +0200 |
| commit | e16852cfc5580b88cb327413ab8c89375f380592 (patch) | |
| tree | 67e7d5b84e2602986f2da689625e5a25d7af7bb4 /drivers/net/skge.c | |
| parent | bdff78707f3ce47e891f3201c9666122a70556ce (diff) | |
| parent | 74e7ff8c50b6b022e6ffaa736b16a4dc161d3eaf (diff) | |
Merge branch 'tracing/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into tracing/urgent
Diffstat (limited to 'drivers/net/skge.c')
| -rw-r--r-- | drivers/net/skge.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/skge.c b/drivers/net/skge.c index 60d502eef4fc..543af2044f40 100644 --- a/drivers/net/skge.c +++ b/drivers/net/skge.c @@ -3854,8 +3854,10 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port, skge->speed = -1; skge->advertising = skge_supported_modes(hw); - if (device_may_wakeup(&hw->pdev->dev)) + if (device_can_wakeup(&hw->pdev->dev)) { skge->wol = wol_supported(hw) & WAKE_MAGIC; + device_set_wakeup_enable(&hw->pdev->dev, skge->wol); + } hw->dev[port] = dev; |