git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
net
/
atarilance.c
diff --git
a/drivers/net/atarilance.c
b/drivers/net/atarilance.c
index
e462e2f
..
ad01121
100644
(file)
--- 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/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/setup.h>
#include <asm/irq.h>
#include <asm/atarihw.h>
#include <asm/atariints.h>
-#include <asm/bitops.h>
#include <asm/io.h>
/* Debug level:
#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" );
}
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++ )
MEM->init.mode = 0x0000; /* Disable Rx and Tx. */
for( i = 0; i < 6; i++ )