This commit was manufactured by cvs2svn to create tag

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

diff --git a/drivers/net/znet.c b/drivers/net/znet.c
index 20b2691..9ebd5ea 100644 (file)
--- a/drivers/net/znet.c
+++ b/drivers/net/znet.c
@@ -98,9 +98,9 @@
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/if_arp.h>
-#include <linux/bitops.h>
 
 #include <asm/system.h>
+#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 
@@ -421,7 +421,7 @@ static int __init znet_probe (void)
 
        znet->rx_dma = netinfo->dma1;
        znet->tx_dma = netinfo->dma2;
-       spin_lock_init(&znet->lock);
+       znet->lock = SPIN_LOCK_UNLOCKED;
        znet->sia_base = 0xe6;  /* Magic address for the 82501 SIA */
        znet->sia_size = 2;
        /* maz: Despite the '593 being advertised above as using a