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
/
znet.c
diff --git
a/drivers/net/znet.c
b/drivers/net/znet.c
index
9ebd5ea
..
3ac047b
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/etherdevice.h>
#include <linux/skbuff.h>
#include <linux/if_arp.h>
+#include <linux/bitops.h>
#include <asm/system.h>
#include <asm/system.h>
-#include <asm/bitops.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <asm/io.h>
#include <asm/dma.h>
@@
-113,7
+113,7
@@
static char version[] __initdata = "znet.c:v1.02 9/23/94 becker@scyld.com\n";
#define ZNET_DEBUG 1
#endif
static unsigned int znet_debug = ZNET_DEBUG;
#define ZNET_DEBUG 1
#endif
static unsigned int znet_debug = ZNET_DEBUG;
-
MODULE_PARM (znet_debug, "i"
);
+
module_param (znet_debug, int, 0
);
MODULE_PARM_DESC (znet_debug, "ZNet debug level");
MODULE_LICENSE("GPL");
MODULE_PARM_DESC (znet_debug, "ZNet debug level");
MODULE_LICENSE("GPL");
@@
-421,7
+421,7
@@
static int __init znet_probe (void)
znet->rx_dma = netinfo->dma1;
znet->tx_dma = netinfo->dma2;
znet->rx_dma = netinfo->dma1;
znet->tx_dma = netinfo->dma2;
-
znet->lock = SPIN_LOCK_UNLOCKED
;
+
spin_lock_init(&znet->lock)
;
znet->sia_base = 0xe6; /* Magic address for the 82501 SIA */
znet->sia_size = 2;
/* maz: Despite the '593 being advertised above as using a
znet->sia_base = 0xe6; /* Magic address for the 82501 SIA */
znet->sia_size = 2;
/* maz: Despite the '593 being advertised above as using a