X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=drivers%2Fnet%2Fatarilance.c;h=ad011214c7f2a0ffc19029642aacda83e3065e6a;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=e462e2fca538ceda57e18f487af43730902bf730;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git

diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c
index e462e2fca..ad011214c 100644
--- a/drivers/net/atarilance.c
+++ b/drivers/net/atarilance.c
@@ -56,12 +56,12 @@ static char version[] = "atarilance.c: v1.3 04/04/96 "
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
 #include <asm/setup.h>
 #include <asm/irq.h>
 #include <asm/atarihw.h>
 #include <asm/atariints.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 
 /* Debug level:
@@ -606,7 +606,7 @@ static unsigned long __init lance_probe1( struct net_device *dev,
 		printk( "      Use \"ifconfig hw ether ...\" to set the address.\n" );
 	}
 
-	lp->devlock = SPIN_LOCK_UNLOCKED;
+	spin_lock_init(&lp->devlock);
 
 	MEM->init.mode = 0x0000;		/* Disable Rx and Tx. */
 	for( i = 0; i < 6; i++ )