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 core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
net
/
wan
/
sealevel.c
diff --git
a/drivers/net/wan/sealevel.c
b/drivers/net/wan/sealevel.c
index
3f997bf
..
70fb1b9
100644
(file)
--- a/
drivers/net/wan/sealevel.c
+++ b/
drivers/net/wan/sealevel.c
@@
-23,6
+23,7
@@
#include <linux/init.h>
#include <net/arp.h>
#include <linux/init.h>
#include <net/arp.h>
+#include <asm/irq.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <asm/byteorder.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <asm/byteorder.h>
@@
-321,7
+322,7
@@
static __init struct slvl_board *slvl_init(int iobase, int irq,
/* We want a fast IRQ for this device. Actually we'd like an even faster
IRQ ;) - This is one driver RtLinux is made for */
/* We want a fast IRQ for this device. Actually we'd like an even faster
IRQ ;) - This is one driver RtLinux is made for */
- if(request_irq(irq, &z8530_interrupt,
SA_INTERRUPT
, "SeaLevel", dev)<0)
+ if(request_irq(irq, &z8530_interrupt,
IRQF_DISABLED
, "SeaLevel", dev)<0)
{
printk(KERN_WARNING "sealevel: IRQ %d already in use.\n", irq);
goto fail1_1;
{
printk(KERN_WARNING "sealevel: IRQ %d already in use.\n", irq);
goto fail1_1;
@@
-431,15
+432,15
@@
static int rxdma=3;
static int irq=5;
static int slow=0;
static int irq=5;
static int slow=0;
-
MODULE_PARM(io,"i"
);
+
module_param(io, int, 0
);
MODULE_PARM_DESC(io, "The I/O base of the Sealevel card");
MODULE_PARM_DESC(io, "The I/O base of the Sealevel card");
-
MODULE_PARM(txdma,"i"
);
+
module_param(txdma, int, 0
);
MODULE_PARM_DESC(txdma, "Transmit DMA channel");
MODULE_PARM_DESC(txdma, "Transmit DMA channel");
-
MODULE_PARM(rxdma,"i"
);
+
module_param(rxdma, int, 0
);
MODULE_PARM_DESC(rxdma, "Receive DMA channel");
MODULE_PARM_DESC(rxdma, "Receive DMA channel");
-
MODULE_PARM(irq,"i"
);
+
module_param(irq, int, 0
);
MODULE_PARM_DESC(irq, "The interrupt line setting for the SeaLevel card");
MODULE_PARM_DESC(irq, "The interrupt line setting for the SeaLevel card");
-
MODULE_PARM(slow,"i"
);
+
module_param(slow, bool, 0
);
MODULE_PARM_DESC(slow, "Set this for an older Sealevel card such as the 4012");
MODULE_AUTHOR("Alan Cox");
MODULE_PARM_DESC(slow, "Set this for an older Sealevel card such as the 4012");
MODULE_AUTHOR("Alan Cox");