Merge branch 'linus' into x86/signal

[pandora-kernel.git] / drivers / net / myri_sbus.c

diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c
index 8d29319..06e6823 100644 (file)
--- a/drivers/net/myri_sbus.c
+++ b/drivers/net/myri_sbus.c
@@ -134,7 +134,7 @@ static int myri_do_handshake(struct myri_eth *mp)
 
        myri_disable_irq(mp->lregs, cregs);
 
-       while (tick++ <= 25) {
+       while (tick++ < 25) {
                u32 softstate;
 
                /* Wake it up. */
@@ -1118,7 +1118,7 @@ static int __devexit myri_sbus_remove(struct of_device *dev)
        struct myri_eth *mp = dev_get_drvdata(&dev->dev);
        struct net_device *net_dev = mp->dev;
 
-       unregister_netdevice(net_dev);
+       unregister_netdev(net_dev);
 
        free_irq(net_dev->irq, net_dev);