aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-07 11:40:24 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-07 11:40:24 -0700
commit4886b5b485ec78fe4a16fedaccfab39bdf55410f (patch)
tree3946e0e444311245db5248bac6658e9b8082f269
parentcbeb2864b162f4298111196c8ce8ce492577cdee (diff)
parentd9d8e0418ffd3d189345c435861e254c17ae06e5 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: gianfar: Fix build.
-rw-r--r--drivers/net/gianfar.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 24f7ca5e17de..a00ec639c380 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -491,7 +491,7 @@ static int gfar_remove(struct of_device *ofdev)
dev_set_drvdata(&ofdev->dev, NULL);
- unregister_netdev(dev);
+ unregister_netdev(priv->ndev);
iounmap(priv->regs);
free_netdev(priv->ndev);

Privacy Policy