aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/wavefront/wavefront.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2006-07-01 22:29:46 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-02 16:58:54 -0400
commit65ca68b30073473583f6ca2f463cbd94ade43ddb (patch)
treef7d4384450fbdfcb2661a74f3c2f28e53721eeb0 /sound/isa/wavefront/wavefront.c
parent63a43399db67d6f94364f933f68f38f58387737a (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/wavefront/wavefront.c')
-rw-r--r--sound/isa/wavefront/wavefront.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/isa/wavefront/wavefront.c b/sound/isa/wavefront/wavefront.c
index 9eb27082c659..a8f8d2fa9d76 100644
--- a/sound/isa/wavefront/wavefront.c
+++ b/sound/isa/wavefront/wavefront.c
@@ -467,7 +467,7 @@ snd_wavefront_probe (struct snd_card *card, int dev)
467 return -EBUSY; 467 return -EBUSY;
468 } 468 }
469 if (request_irq(ics2115_irq[dev], snd_wavefront_ics2115_interrupt, 469 if (request_irq(ics2115_irq[dev], snd_wavefront_ics2115_interrupt,
470 SA_INTERRUPT, "ICS2115", acard)) { 470 IRQF_DISABLED, "ICS2115", acard)) {
471 snd_printk(KERN_ERR "unable to use ICS2115 IRQ %d\n", ics2115_irq[dev]); 471 snd_printk(KERN_ERR "unable to use ICS2115 IRQ %d\n", ics2115_irq[dev]);
472 return -EBUSY; 472 return -EBUSY;
473 } 473 }
@@ -497,7 +497,7 @@ snd_wavefront_probe (struct snd_card *card, int dev)
497 if ((err = snd_mpu401_uart_new(card, midi_dev, MPU401_HW_CS4232, 497 if ((err = snd_mpu401_uart_new(card, midi_dev, MPU401_HW_CS4232,
498 cs4232_mpu_port[dev], 0, 498 cs4232_mpu_port[dev], 0,
499 cs4232_mpu_irq[dev], 499 cs4232_mpu_irq[dev],
500 SA_INTERRUPT, 500 IRQF_DISABLED,
501 NULL)) < 0) { 501 NULL)) < 0) {
502 snd_printk (KERN_ERR "can't allocate CS4232 MPU-401 device\n"); 502 snd_printk (KERN_ERR "can't allocate CS4232 MPU-401 device\n");
503 return err; 503 return err;