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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
sound
/
isa
/
sb
/
sb_common.c
diff --git
a/sound/isa/sb/sb_common.c
b/sound/isa/sb/sb_common.c
index
f343a82
..
3094f38
100644
(file)
--- a/
sound/isa/sb/sb_common.c
+++ b/
sound/isa/sb/sb_common.c
@@
-205,7
+205,7
@@
static int snd_sbdsp_dev_free(struct snd_device *device)
int snd_sbdsp_create(struct snd_card *card,
unsigned long port,
int irq,
int snd_sbdsp_create(struct snd_card *card,
unsigned long port,
int irq,
- irq
return_t (*irq_handler)(int, void *, struct pt_regs *)
,
+ irq
_handler_t irq_handler
,
int dma8,
int dma16,
unsigned short hardware,
int dma8,
int dma16,
unsigned short hardware,
@@
-232,7
+232,7
@@
int snd_sbdsp_create(struct snd_card *card,
chip->port = port;
if (request_irq(irq, irq_handler, hardware == SB_HW_ALS4000 ?
chip->port = port;
if (request_irq(irq, irq_handler, hardware == SB_HW_ALS4000 ?
-
SA_INTERRUPT | SA_SHIRQ : SA_INTERRUPT
,
+
IRQF_SHARED : IRQF_DISABLED
,
"SoundBlaster", (void *) chip)) {
snd_printk(KERN_ERR "sb: can't grab irq %d\n", irq);
snd_sbdsp_free(chip);
"SoundBlaster", (void *) chip)) {
snd_printk(KERN_ERR "sb: can't grab irq %d\n", irq);
snd_sbdsp_free(chip);