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
/
ni52.c
diff --git
a/drivers/net/ni52.c
b/drivers/net/ni52.c
index
234709d
..
fa854c8
100644
(file)
--- a/
drivers/net/ni52.c
+++ b/
drivers/net/ni52.c
@@
-115,7
+115,7
@@
static int fifo=0x8; /* don't change */
#include <linux/interrupt.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/delay.h>
#include <linux/init.h>
-#include <
asm
/bitops.h>
+#include <
linux
/bitops.h>
#include <asm/io.h>
#include <linux/netdevice.h>
#include <asm/io.h>
#include <linux/netdevice.h>
@@
-1314,10
+1314,10
@@
static void set_multicast_list(struct net_device *dev)
#ifdef MODULE
static struct net_device *dev_ni52;
#ifdef MODULE
static struct net_device *dev_ni52;
-
MODULE_PARM(io, "i"
);
-
MODULE_PARM(irq, "i"
);
-
MODULE_PARM(memstart, "l"
);
-
MODULE_PARM(memend, "l"
);
+
module_param(io, int, 0
);
+
module_param(irq, int, 0
);
+
module_param(memstart, long, 0
);
+
module_param(memend, long, 0
);
MODULE_PARM_DESC(io, "NI5210 I/O base address,required");
MODULE_PARM_DESC(irq, "NI5210 IRQ number,required");
MODULE_PARM_DESC(memstart, "NI5210 memory base address,required");
MODULE_PARM_DESC(io, "NI5210 I/O base address,required");
MODULE_PARM_DESC(irq, "NI5210 IRQ number,required");
MODULE_PARM_DESC(memstart, "NI5210 memory base address,required");