diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-07 14:40:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-07 14:40:24 -0400 |
| commit | 4886b5b485ec78fe4a16fedaccfab39bdf55410f (patch) | |
| tree | 3946e0e444311245db5248bac6658e9b8082f269 /drivers | |
| 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.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/gianfar.c | 2 |
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) | |||
| 491 | 491 | ||
| 492 | dev_set_drvdata(&ofdev->dev, NULL); | 492 | dev_set_drvdata(&ofdev->dev, NULL); |
| 493 | 493 | ||
| 494 | unregister_netdev(dev); | 494 | unregister_netdev(priv->ndev); |
| 495 | iounmap(priv->regs); | 495 | iounmap(priv->regs); |
| 496 | free_netdev(priv->ndev); | 496 | free_netdev(priv->ndev); |
| 497 | 497 | ||