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]
/
sound
/
oss
/
esssolo1.c
diff --git
a/sound/oss/esssolo1.c
b/sound/oss/esssolo1.c
index
6861563
..
82f40a0
100644
(file)
--- a/
sound/oss/esssolo1.c
+++ b/
sound/oss/esssolo1.c
@@
-2392,7
+2392,7
@@
static int __devinit solo1_probe(struct pci_dev *pcidev, const struct pci_device
printk(KERN_ERR "solo1: io ports in use\n");
goto err_region4;
}
printk(KERN_ERR "solo1: io ports in use\n");
goto err_region4;
}
- if ((ret=request_irq(s->irq,solo1_interrupt,
SA_SHIRQ
,"ESS Solo1",s))) {
+ if ((ret=request_irq(s->irq,solo1_interrupt,
IRQF_SHARED
,"ESS Solo1",s))) {
printk(KERN_ERR "solo1: irq %u in use\n", s->irq);
goto err_irq;
}
printk(KERN_ERR "solo1: irq %u in use\n", s->irq);
goto err_irq;
}