diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-01 22:29:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 16:58:54 -0400 |
commit | 65ca68b30073473583f6ca2f463cbd94ade43ddb (patch) | |
tree | f7d4384450fbdfcb2661a74f3c2f28e53721eeb0 /sound/isa/opti9xx | |
parent | 63a43399db67d6f94364f933f68f38f58387737a (diff) |
[PATCH] irq-flags: sound: Use the new IRQF_ constants
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Jaroslav Kysela <perex@suse.cz>
Cc: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/isa/opti9xx')
-rw-r--r-- | sound/isa/opti9xx/miro.c | 2 | ||||
-rw-r--r-- | sound/isa/opti9xx/opti92x-ad1848.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c index 283817f2de75..1dd98375ac85 100644 --- a/sound/isa/opti9xx/miro.c +++ b/sound/isa/opti9xx/miro.c | |||
@@ -1382,7 +1382,7 @@ static int __init snd_miro_probe(struct platform_device *devptr) | |||
1382 | rmidi = NULL; | 1382 | rmidi = NULL; |
1383 | else | 1383 | else |
1384 | if ((error = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401, | 1384 | if ((error = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401, |
1385 | miro->mpu_port, 0, miro->mpu_irq, SA_INTERRUPT, | 1385 | miro->mpu_port, 0, miro->mpu_irq, IRQF_DISABLED, |
1386 | &rmidi))) | 1386 | &rmidi))) |
1387 | snd_printk(KERN_WARNING "no MPU-401 device at 0x%lx?\n", miro->mpu_port); | 1387 | snd_printk(KERN_WARNING "no MPU-401 device at 0x%lx?\n", miro->mpu_port); |
1388 | 1388 | ||
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c index 8ee0d70536f9..9d528ae00bff 100644 --- a/sound/isa/opti9xx/opti92x-ad1848.c +++ b/sound/isa/opti9xx/opti92x-ad1848.c | |||
@@ -1291,7 +1291,7 @@ static int snd_opti93x_create(struct snd_card *card, struct snd_opti9xx *chip, | |||
1291 | } | 1291 | } |
1292 | codec->dma2 = chip->dma2; | 1292 | codec->dma2 = chip->dma2; |
1293 | 1293 | ||
1294 | if (request_irq(chip->irq, snd_opti93x_interrupt, SA_INTERRUPT, DRIVER_NAME" - WSS", codec)) { | 1294 | if (request_irq(chip->irq, snd_opti93x_interrupt, IRQF_DISABLED, DRIVER_NAME" - WSS", codec)) { |
1295 | snd_printk(KERN_ERR "opti9xx: can't grab IRQ %d\n", chip->irq); | 1295 | snd_printk(KERN_ERR "opti9xx: can't grab IRQ %d\n", chip->irq); |
1296 | snd_opti93x_free(codec); | 1296 | snd_opti93x_free(codec); |
1297 | return -EBUSY; | 1297 | return -EBUSY; |
@@ -1863,7 +1863,7 @@ static int __init snd_opti9xx_probe(struct snd_card *card) | |||
1863 | rmidi = NULL; | 1863 | rmidi = NULL; |
1864 | else | 1864 | else |
1865 | if ((error = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401, | 1865 | if ((error = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401, |
1866 | chip->mpu_port, 0, chip->mpu_irq, SA_INTERRUPT, | 1866 | chip->mpu_port, 0, chip->mpu_irq, IRQF_DISABLED, |
1867 | &rmidi))) | 1867 | &rmidi))) |
1868 | snd_printk(KERN_WARNING "no MPU-401 device at 0x%lx?\n", | 1868 | snd_printk(KERN_WARNING "no MPU-401 device at 0x%lx?\n", |
1869 | chip->mpu_port); | 1869 | chip->mpu_port); |