git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/hdrinstall-2.6
[pandora-kernel.git]
/
sound
/
isa
/
sgalaxy.c
diff --git
a/sound/isa/sgalaxy.c
b/sound/isa/sgalaxy.c
index
09c8e8c
..
8742fa5
100644
(file)
--- a/
sound/isa/sgalaxy.c
+++ b/
sound/isa/sgalaxy.c
@@
-147,7
+147,7
@@
static int __init snd_sgalaxy_setup_wss(unsigned long port, int irq, int dma)
if (tmp < 0)
return -EINVAL;
if (tmp < 0)
return -EINVAL;
- if (request_irq(irq, snd_sgalaxy_dummy_interrupt,
SA_INTERRUPT
, "sgalaxy", NULL)) {
+ if (request_irq(irq, snd_sgalaxy_dummy_interrupt,
IRQF_DISABLED
, "sgalaxy", NULL)) {
snd_printk(KERN_ERR "sgalaxy: can't grab irq %d\n", irq);
return -EIO;
}
snd_printk(KERN_ERR "sgalaxy: can't grab irq %d\n", irq);
return -EIO;
}