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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
net
/
at1700.c
diff --git
a/drivers/net/at1700.c
b/drivers/net/at1700.c
index
a3e7e63
..
e613cc2
100644
(file)
--- a/
drivers/net/at1700.c
+++ b/
drivers/net/at1700.c
@@
-34,10
+34,6
@@
only is it difficult to detect, it also moves around in I/O space in
response to inb()s from other device probes!
*/
only is it difficult to detect, it also moves around in I/O space in
response to inb()s from other device probes!
*/
-/*
- 99/03/03 Allied Telesis RE1000 Plus support by T.Hagawa
- 99/12/30 port to 2.3.35 by K.Takai
-*/
#include <linux/config.h>
#include <linux/errno.h>
#include <linux/config.h>
#include <linux/errno.h>
@@
-56,9
+52,9
@@
#include <linux/string.h>
#include <linux/init.h>
#include <linux/crc32.h>
#include <linux/string.h>
#include <linux/init.h>
#include <linux/crc32.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>
@@
-899,9
+895,9
@@
set_rx_mode(struct net_device *dev)
#ifdef MODULE
static struct net_device *dev_at1700;
#ifdef MODULE
static struct net_device *dev_at1700;
-
MODULE_PARM(io, "i"
);
-
MODULE_PARM(irq, "i"
);
-
MODULE_PARM(net_debug, "i"
);
+
module_param(io, int, 0
);
+
module_param(irq, int, 0
);
+
module_param(net_debug, int, 0
);
MODULE_PARM_DESC(io, "AT1700/FMV18X I/O base address");
MODULE_PARM_DESC(irq, "AT1700/FMV18X IRQ number");
MODULE_PARM_DESC(net_debug, "AT1700/FMV18X debug level (0-6)");
MODULE_PARM_DESC(io, "AT1700/FMV18X I/O base address");
MODULE_PARM_DESC(irq, "AT1700/FMV18X IRQ number");
MODULE_PARM_DESC(net_debug, "AT1700/FMV18X debug level (0-6)");