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
/
maestro3.c
diff --git
a/sound/oss/maestro3.c
b/sound/oss/maestro3.c
index
4a5e423
..
5548e3c
100644
(file)
--- a/
sound/oss/maestro3.c
+++ b/
sound/oss/maestro3.c
@@
-2694,7
+2694,7
@@
static int __devinit m3_probe(struct pci_dev *pci_dev, const struct pci_device_i
}
}
}
}
- if(request_irq(card->irq, m3_interrupt,
SA_SHIRQ
, card_names[card->card_type], card)) {
+ if(request_irq(card->irq, m3_interrupt,
IRQF_SHARED
, card_names[card->card_type], card)) {
printk(KERN_ERR PFX "unable to allocate irq %d,\n", card->irq);
printk(KERN_ERR PFX "unable to allocate irq %d,\n", card->irq);