Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[net-next-2.6.git] / drivers / net / sunbmac.c

diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c
index 3f342b35a77f6a48033ad49b77b39372bfc94ba3..018d0fca9422bc2760c835b6f9a9de46670da7e1 100644 (file)
--- a/drivers/net/sunbmac.c
+++ b/drivers/net/sunbmac.c
@@ -1263,7 +1263,7 @@ static int __devexit bigmac_sbus_remove(struct of_device *op)
 
        qec_op = to_of_device(parent);
 
-       unregister_netdevice(net_dev);
+       unregister_netdev(net_dev);
 
        of_iounmap(&qec_op->resource[0], bp->gregs, GLOB_REG_SIZE);
        of_iounmap(&op->resource[0], bp->creg, CREG_REG_SIZE);