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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
net
/
3c523.c
diff --git
a/drivers/net/3c523.c
b/drivers/net/3c523.c
index
b40885d
..
5dfd97f
100644
(file)
--- a/
drivers/net/3c523.c
+++ b/
drivers/net/3c523.c
@@
-289,7
+289,7
@@
static int elmc_open(struct net_device *dev)
elmc_id_attn586(); /* disable interrupts */
elmc_id_attn586(); /* disable interrupts */
- ret = request_irq(dev->irq, &elmc_interrupt,
SA_SHIRQ | SA
_SAMPLE_RANDOM,
+ ret = request_irq(dev->irq, &elmc_interrupt,
IRQF_SHARED | IRQF
_SAMPLE_RANDOM,
dev->name, dev);
if (ret) {
printk(KERN_ERR "%s: couldn't get irq %d\n", dev->name, dev->irq);
dev->name, dev);
if (ret) {
printk(KERN_ERR "%s: couldn't get irq %d\n", dev->name, dev->irq);
@@
-1277,7
+1277,7
@@
MODULE_PARM_DESC(io, "EtherLink/MC I/O base address(es)");
MODULE_PARM_DESC(irq, "EtherLink/MC IRQ number(s)");
MODULE_LICENSE("GPL");
MODULE_PARM_DESC(irq, "EtherLink/MC IRQ number(s)");
MODULE_LICENSE("GPL");
-int init_module(void)
+int
__init
init_module(void)
{
int this_dev,found = 0;
{
int this_dev,found = 0;