diff options
| author |   David S. Miller <davem@davemloft.net> | 2009-09-02 00:32:56 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-02 00:32:56 -0700 |
| commit | 6cdee2f96a97f6da26bd3759c3f8823332fbb438 (patch) | |
| tree | ec79086f05ffc3bdf1aecc37e108ccfc3a95450d /drivers/net/gianfar.c | |
| parent | ipv6: ip6_push_pending_frames() should increment IPSTATS_MIB_OUTDISCARDS (diff) | |
| parent | pkt_sched: Revert tasklet_hrtimer changes. (diff) | |
| download | linux-dev-6cdee2f96a97f6da26bd3759c3f8823332fbb438.tar.xz linux-dev-6cdee2f96a97f6da26bd3759c3f8823332fbb438.zip | |
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) dev_set_drvdata(&ofdev->dev, NULL); + unregister_netdev(dev); iounmap(priv->regs); free_netdev(priv->ndev); |