diff options
author | Sergio Prado <sergio.prado@e-labworks.com> | 2016-02-16 21:10:45 -0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-02-19 15:32:24 -0500 |
commit | 7c4a1d0cfdc169b746e61423ebf49b68133bc50a (patch) | |
tree | 796be6ecadc12f5f79b4efcb258d0569c93f5074 /drivers/net/ethernet/cadence | |
parent | ef240c10e0618d8b1878bf0cec2cf8c68cb8b9fb (diff) | |
download | talos-obmc-linux-7c4a1d0cfdc169b746e61423ebf49b68133bc50a.tar.gz talos-obmc-linux-7c4a1d0cfdc169b746e61423ebf49b68133bc50a.zip |
net: macb: make magic-packet property generic
As requested by Rob Herring on patch
https://patchwork.ozlabs.org/patch/580862/.
This is a new property that it's still in net-next and has never been
used in production, so we are not breaking anything with the
incompatible binding change.
Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cadence')
-rw-r--r-- | drivers/net/ethernet/cadence/macb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index 69af049e55a8..7ccf2298a5fa 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c @@ -2929,7 +2929,7 @@ static int macb_probe(struct platform_device *pdev) bp->jumbo_max_len = macb_config->jumbo_max_len; bp->wol = 0; - if (of_get_property(np, "cdns,magic-packet", NULL)) + if (of_get_property(np, "magic-packet", NULL)) bp->wol |= MACB_WOL_HAS_MAGIC_PACKET; device_init_wakeup(&pdev->dev, bp->wol & MACB_WOL_HAS_MAGIC_PACKET); |