projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial
[powerpc.git]
/
sound
/
isa
/
gus
/
interwave.c
diff --git
a/sound/isa/gus/interwave.c
b/sound/isa/gus/interwave.c
index
c1c86e0
..
ea69f25
100644
(file)
--- a/
sound/isa/gus/interwave.c
+++ b/
sound/isa/gus/interwave.c
@@
-706,7
+706,7
@@
static int __devinit snd_interwave_probe(struct snd_card *card, int dev)
if ((err = snd_gus_initialize(gus)) < 0)
return err;
if ((err = snd_gus_initialize(gus)) < 0)
return err;
- if (request_irq(xirq, snd_interwave_interrupt,
SA_INTERRUPT
,
+ if (request_irq(xirq, snd_interwave_interrupt,
IRQF_DISABLED
,
"InterWave", iwcard)) {
snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq);
return -EBUSY;
"InterWave", iwcard)) {
snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq);
return -EBUSY;