git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/azt3328' into for-linus
[pandora-kernel.git]
/
drivers
/
net
/
skge.c
diff --git
a/drivers/net/skge.c
b/drivers/net/skge.c
index
60d502e
..
543af20
100644
(file)
--- 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);
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;
skge->wol = wol_supported(hw) & WAKE_MAGIC;
+ device_set_wakeup_enable(&hw->pdev->dev, skge->wol);
+ }
hw->dev[port] = dev;
hw->dev[port] = dev;