This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / net / 82596.c

diff --git a/drivers/net/82596.c b/drivers/net/82596.c
index ff9bf1c..c835712 100644 (file)
--- a/drivers/net/82596.c
+++ b/drivers/net/82596.c
@@ -53,8 +53,8 @@
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/init.h>
-#include <linux/bitops.h>
 
+#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/pgtable.h>
@@ -1260,7 +1260,7 @@ struct net_device * __init i82596_probe(int unit)
        lp->scb.command = 0;
        lp->scb.cmd = I596_NULL;
        lp->scb.rfd = I596_NULL;
-       spin_lock_init(&lp->lock);
+       lp->lock = SPIN_LOCK_UNLOCKED;
 
        err = register_netdev(dev);
        if (err)