X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fnet%2F82596.c;h=c835712edef9b509e94e5958f31bf9929cb64856;hb=3ec04f3d2903fdf6d9849a8633af59b8628164a5;hp=ff9bf1cbe2ab1b78a7ccf4ac12d1a71531a38a24;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git

diff --git a/drivers/net/82596.c b/drivers/net/82596.c
index ff9bf1cbe..c835712ed 100644
--- 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)