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/ad1816a | |
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/ad1816a')
-rw-r--r-- | sound/isa/ad1816a/ad1816a.c | 2 | ||||
-rw-r--r-- | sound/isa/ad1816a/ad1816a_lib.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/isa/ad1816a/ad1816a.c b/sound/isa/ad1816a/ad1816a.c index 31f299aed281..b33a5fb59ec2 100644 --- a/sound/isa/ad1816a/ad1816a.c +++ b/sound/isa/ad1816a/ad1816a.c | |||
@@ -232,7 +232,7 @@ static int __devinit snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard | |||
232 | 232 | ||
233 | if (mpu_port[dev] > 0) { | 233 | if (mpu_port[dev] > 0) { |
234 | if (snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401, | 234 | if (snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401, |
235 | mpu_port[dev], 0, mpu_irq[dev], SA_INTERRUPT, | 235 | mpu_port[dev], 0, mpu_irq[dev], IRQF_DISABLED, |
236 | NULL) < 0) | 236 | NULL) < 0) |
237 | printk(KERN_ERR PFX "no MPU-401 device at 0x%lx.\n", mpu_port[dev]); | 237 | printk(KERN_ERR PFX "no MPU-401 device at 0x%lx.\n", mpu_port[dev]); |
238 | } | 238 | } |
diff --git a/sound/isa/ad1816a/ad1816a_lib.c b/sound/isa/ad1816a/ad1816a_lib.c index fd8fe16c09ee..8fcf2c151823 100644 --- a/sound/isa/ad1816a/ad1816a_lib.c +++ b/sound/isa/ad1816a/ad1816a_lib.c | |||
@@ -599,7 +599,7 @@ int __devinit snd_ad1816a_create(struct snd_card *card, | |||
599 | snd_ad1816a_free(chip); | 599 | snd_ad1816a_free(chip); |
600 | return -EBUSY; | 600 | return -EBUSY; |
601 | } | 601 | } |
602 | if (request_irq(irq, snd_ad1816a_interrupt, SA_INTERRUPT, "AD1816A", (void *) chip)) { | 602 | if (request_irq(irq, snd_ad1816a_interrupt, IRQF_DISABLED, "AD1816A", (void *) chip)) { |
603 | snd_printk(KERN_ERR "ad1816a: can't grab IRQ %d\n", irq); | 603 | snd_printk(KERN_ERR "ad1816a: can't grab IRQ %d\n", irq); |
604 | snd_ad1816a_free(chip); | 604 | snd_ad1816a_free(chip); |
605 | return -EBUSY; | 605 | return -EBUSY; |