diff options
author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2009-03-21 16:27:55 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-21 16:27:55 -0400 |
commit | 29ded5f76ce3c41f43b64643b074b7c9c9ebd925 (patch) | |
tree | 2de9edded589e6b7bdab82acfaa596624b8add75 /drivers/net/gianfar.c | |
parent | b55de80e49892002a1878013ab9aee1a30970be6 (diff) |
gianfar: Fix build with CONFIG_PM enabled
commit 4826857f1bf07f9c0f1495e9b05d125552c88a85 ("gianfar: pass the
proper dev to DMA ops") introduced this build breakage:
CC drivers/net/gianfar.o
drivers/net/gianfar.c: In function 'gfar_suspend':
drivers/net/gianfar.c:552: error: 'struct gfar_private' has no member named 'dev'
drivers/net/gianfar.c: In function 'gfar_resume':
drivers/net/gianfar.c:601: error: 'struct gfar_private' has no member named 'dev'
make[2]: *** [drivers/net/gianfar.o] Error 1
Fix this by converting suspend and resume routines to use
gfar_private->ndev.
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/gianfar.c')
-rw-r--r-- | drivers/net/gianfar.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 8659833f28eb..8a51df045e84 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c | |||
@@ -549,7 +549,7 @@ static int gfar_remove(struct of_device *ofdev) | |||
549 | static int gfar_suspend(struct of_device *ofdev, pm_message_t state) | 549 | static int gfar_suspend(struct of_device *ofdev, pm_message_t state) |
550 | { | 550 | { |
551 | struct gfar_private *priv = dev_get_drvdata(&ofdev->dev); | 551 | struct gfar_private *priv = dev_get_drvdata(&ofdev->dev); |
552 | struct net_device *dev = priv->dev; | 552 | struct net_device *dev = priv->ndev; |
553 | unsigned long flags; | 553 | unsigned long flags; |
554 | u32 tempval; | 554 | u32 tempval; |
555 | 555 | ||
@@ -598,7 +598,7 @@ static int gfar_suspend(struct of_device *ofdev, pm_message_t state) | |||
598 | static int gfar_resume(struct of_device *ofdev) | 598 | static int gfar_resume(struct of_device *ofdev) |
599 | { | 599 | { |
600 | struct gfar_private *priv = dev_get_drvdata(&ofdev->dev); | 600 | struct gfar_private *priv = dev_get_drvdata(&ofdev->dev); |
601 | struct net_device *dev = priv->dev; | 601 | struct net_device *dev = priv->ndev; |
602 | unsigned long flags; | 602 | unsigned long flags; |
603 | u32 tempval; | 603 | u32 tempval; |
604 | int magic_packet = priv->wol_en && | 604 | int magic_packet = priv->wol_en && |