diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-12 05:35:13 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-12 05:35:13 +0200 |
| commit | cabc5c0f7fa1342049042d6e147db5a73773955b (patch) | |
| tree | 2be09ae1777d580c7dfe05d6d5b76e57281ec447 /drivers/net/gianfar.c | |
| parent | sparc64: Initial niagara2 perf counter support. (diff) | |
| parent | Merge git://git.linux-nfs.org/projects/trondmy/nfs-2.6 (diff) | |
| download | linux-cabc5c0f7fa1342049042d6e147db5a73773955b.tar.xz linux-cabc5c0f7fa1342049042d6e147db5a73773955b.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
arch/sparc/Kconfig
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 e212f2c5448b..a00ec639c380 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c @@ -491,6 +491,7 @@ static int gfar_remove(struct of_device *ofdev) dev_set_drvdata(&ofdev->dev, NULL); + unregister_netdev(priv->ndev); iounmap(priv->regs); free_netdev(priv->ndev); |