diff options
author | 2006-07-01 19:29:46 -0700 | |
---|---|---|
committer | 2006-07-02 13:58:54 -0700 | |
commit | 65ca68b30073473583f6ca2f463cbd94ade43ddb (patch) | |
tree | f7d4384450fbdfcb2661a74f3c2f28e53721eeb0 /sound/pci/es1938.c | |
parent | [PATCH] irq-flags: video: Use the new IRQF_ constants (diff) | |
download | linux-65ca68b30073473583f6ca2f463cbd94ade43ddb.tar.gz linux-65ca68b30073473583f6ca2f463cbd94ade43ddb.tar.bz2 linux-65ca68b30073473583f6ca2f463cbd94ade43ddb.zip |
[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/pci/es1938.c')
-rw-r--r-- | sound/pci/es1938.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c index ca6603fe0b11..1113b10259cf 100644 --- a/sound/pci/es1938.c +++ b/sound/pci/es1938.c @@ -1429,7 +1429,7 @@ static int es1938_resume(struct pci_dev *pci) pci_restore_state(pci); pci_enable_device(pci); request_irq(pci->irq, snd_es1938_interrupt, - SA_INTERRUPT|SA_SHIRQ, "ES1938", chip); + IRQF_DISABLED|IRQF_SHARED, "ES1938", chip); chip->irq = pci->irq; snd_es1938_chip_init(chip); @@ -1544,7 +1544,7 @@ static int __devinit snd_es1938_create(struct snd_card *card, chip->vc_port = pci_resource_start(pci, 2); chip->mpu_port = pci_resource_start(pci, 3); chip->game_port = pci_resource_start(pci, 4); - if (request_irq(pci->irq, snd_es1938_interrupt, SA_INTERRUPT|SA_SHIRQ, + if (request_irq(pci->irq, snd_es1938_interrupt, IRQF_DISABLED|IRQF_SHARED, "ES1938", chip)) { snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); snd_es1938_free(chip); |