projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
[linux-2.6-block.git]
/
drivers
/
net
/
myri_sbus.c
diff --git
a/drivers/net/myri_sbus.c
b/drivers/net/myri_sbus.c
index 979d778b133b8242dba21a3a70468ee066b6d2d6..3ad7589d6a1c36b341920e6a2c4548d34de3ff92 100644
(file)
--- 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)
struct myri_eth *mp = dev_get_drvdata(&op->dev);
struct net_device *net_dev = mp->dev;
- unregister_netdev
ice
(net_dev);
+ unregister_netdev(net_dev);
free_irq(net_dev->irq, net_dev);