This commit was manufactured by cvs2svn to create tag

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

diff --git a/drivers/net/lasi_82596.c b/drivers/net/lasi_82596.c
index 5e263fc..b315acb 100644 (file)
--- a/drivers/net/lasi_82596.c
+++ b/drivers/net/lasi_82596.c
@@ -83,8 +83,8 @@
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/types.h>
-#include <linux/bitops.h>
 
+#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
 #include <asm/irq.h>
@@ -1218,7 +1218,7 @@ static int __devinit i82596_probe(struct net_device *dev,
        lp->scb.command = 0;
        lp->scb.cmd = I596_NULL;
        lp->scb.rfd = I596_NULL;
-       spin_lock_init(&lp->lock);
+       lp->lock = SPIN_LOCK_UNLOCKED;
        lp->dma_addr = dma_addr;
        lp->dev = gen_dev;