aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/myri_sbus.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-10-11 15:39:35 -0400
committerDavid S. Miller <davem@davemloft.net>2008-10-11 15:39:35 -0400
commit56c5d900dbb8e042bfad035d18433476931d8f93 (patch)
tree00b793965beeef10db03e0ff021d2d965c410759 /drivers/net/myri_sbus.c
parent4dd95b63ae25c5cad6986829b5e8788e9faa0330 (diff)
parentead9d23d803ea3a73766c3cb27bf7563ac8d7266 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: sound/core/memalloc.c
Diffstat (limited to 'drivers/net/myri_sbus.c')
-rw-r--r--drivers/net/myri_sbus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c
index 979d778b133b..3ad7589d6a1c 100644
--- a/drivers/net/myri_sbus.c
+++ b/drivers/net/myri_sbus.c
@@ -1106,7 +1106,7 @@ static int __devexit myri_sbus_remove(struct of_device *op)
1106 struct myri_eth *mp = dev_get_drvdata(&op->dev); 1106 struct myri_eth *mp = dev_get_drvdata(&op->dev);
1107 struct net_device *net_dev = mp->dev; 1107 struct net_device *net_dev = mp->dev;
1108 1108
1109 unregister_netdevice(net_dev); 1109 unregister_netdev(net_dev);
1110 1110
1111 free_irq(net_dev->irq, net_dev); 1111 free_irq(net_dev->irq, net_dev);
1112 1112