From abb36c6690cc569b6fd6704e427c5febfb30aedf Mon Sep 17 00:00:00 2001 From: Anton Vorontsov Date: Sat, 21 Mar 2009 13:27:55 -0700 Subject: [PATCH] --- yaml --- r: 135345 b: refs/heads/master c: 29ded5f76ce3c41f43b64643b074b7c9c9ebd925 h: refs/heads/master i: 135343: 6f6a0a18f4fbb3187fa0d3bd29ee9eac531c8299 v: v3 --- [refs] | 2 +- trunk/drivers/net/gianfar.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0dcabd8c9bc6..0bf6e2e093da 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b55de80e49892002a1878013ab9aee1a30970be6 +refs/heads/master: 29ded5f76ce3c41f43b64643b074b7c9c9ebd925 diff --git a/trunk/drivers/net/gianfar.c b/trunk/drivers/net/gianfar.c index 8659833f28eb..8a51df045e84 100644 --- a/trunk/drivers/net/gianfar.c +++ b/trunk/drivers/net/gianfar.c @@ -549,7 +549,7 @@ static int gfar_remove(struct of_device *ofdev) static int gfar_suspend(struct of_device *ofdev, pm_message_t state) { struct gfar_private *priv = dev_get_drvdata(&ofdev->dev); - struct net_device *dev = priv->dev; + struct net_device *dev = priv->ndev; unsigned long flags; u32 tempval; @@ -598,7 +598,7 @@ static int gfar_suspend(struct of_device *ofdev, pm_message_t state) static int gfar_resume(struct of_device *ofdev) { struct gfar_private *priv = dev_get_drvdata(&ofdev->dev); - struct net_device *dev = priv->dev; + struct net_device *dev = priv->ndev; unsigned long flags; u32 tempval; int magic_packet = priv->wol_en &&