| commit | 4886b5b485ec78fe4a16fedaccfab39bdf55410f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Sep 07 11:40:24 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Sep 07 11:40:24 2009 -0700 |
| tree | 3946e0e444311245db5248bac6658e9b8082f269 | |
| parent | cbeb2864b162f4298111196c8ce8ce492577cdee [diff] | |
| parent | d9d8e0418ffd3d189345c435861e254c17ae06e5 [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.
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 24f7ca5..a00ec63 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c
@@ -491,7 +491,7 @@ dev_set_drvdata(&ofdev->dev, NULL); - unregister_netdev(dev); + unregister_netdev(priv->ndev); iounmap(priv->regs); free_netdev(priv->ndev);