diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-02 03:32:56 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-02 03:32:56 -0400 |
| commit | 6cdee2f96a97f6da26bd3759c3f8823332fbb438 (patch) | |
| tree | ec79086f05ffc3bdf1aecc37e108ccfc3a95450d /drivers/net/gianfar.c | |
| parent | 0625491493d9000e4556bf566d205c28c8e7dc4e (diff) | |
| parent | 2fbd3da3877ad8d923b055e5996f80b4d4a6daf4 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/yellowfin.c
Diffstat (limited to 'drivers/net/gianfar.c')
| -rw-r--r-- | drivers/net/gianfar.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 4544da4cf3ce..772104c5ed26 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c | |||
| @@ -490,6 +490,7 @@ static int gfar_remove(struct of_device *ofdev) | |||
| 490 | 490 | ||
| 491 | dev_set_drvdata(&ofdev->dev, NULL); | 491 | dev_set_drvdata(&ofdev->dev, NULL); |
| 492 | 492 | ||
| 493 | unregister_netdev(dev); | ||
| 493 | iounmap(priv->regs); | 494 | iounmap(priv->regs); |
| 494 | free_netdev(priv->ndev); | 495 | free_netdev(priv->ndev); |
| 495 | 496 | ||