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
/
hostess_sv11.c
diff --git
a/drivers/net/wan/hostess_sv11.c
b/drivers/net/wan/hostess_sv11.c
index
be8d583
..
a02c5fb
100644
(file)
--- a/
drivers/net/wan/hostess_sv11.c
+++ b/
drivers/net/wan/hostess_sv11.c
@@
-29,6
+29,7
@@
#include <linux/ioport.h>
#include <net/arp.h>
#include <linux/ioport.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>
@@
-230,7
+231,7
@@
static struct sv11_device *sv11_init(int iobase, int irq)
return NULL;
}
return NULL;
}
- sv
=(struct sv11_device *)
kmalloc(sizeof(struct sv11_device), GFP_KERNEL);
+ sv
=
kmalloc(sizeof(struct sv11_device), GFP_KERNEL);
if(!sv)
goto fail3;
if(!sv)
goto fail3;
@@
-263,7
+264,7
@@
static struct sv11_device *sv11_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, "Hostess SV/
11", dev)<0)
+ if(request_irq(irq, &z8530_interrupt,
IRQF_DISABLED, "Hostess SV
11", dev)<0)
{
printk(KERN_WARNING "hostess: IRQ %d already in use.\n", irq);
goto fail1;
{
printk(KERN_WARNING "hostess: IRQ %d already in use.\n", irq);
goto fail1;
@@
-388,11
+389,11
@@
static void sv11_shutdown(struct sv11_device *dev)
static int io=0x200;
static int irq=9;
static int io=0x200;
static int irq=9;
-
MODULE_PARM(io,"i"
);
+
module_param(io, int, 0
);
MODULE_PARM_DESC(io, "The I/O base of the Comtrol Hostess SV11 card");
MODULE_PARM_DESC(io, "The I/O base of the Comtrol Hostess SV11 card");
-
MODULE_PARM(dma,"i"
);
+
module_param(dma, int, 0
);
MODULE_PARM_DESC(dma, "Set this to 1 to use DMA1/DMA3 for TX/RX");
MODULE_PARM_DESC(dma, "Set this to 1 to use DMA1/DMA3 for TX/RX");
-
MODULE_PARM(irq,"i"
);
+
module_param(irq, int, 0
);
MODULE_PARM_DESC(irq, "The interrupt line setting for the Comtrol Hostess SV11 card");
MODULE_AUTHOR("Alan Cox");
MODULE_PARM_DESC(irq, "The interrupt line setting for the Comtrol Hostess SV11 card");
MODULE_AUTHOR("Alan Cox");