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/pci/es1938.c | |
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/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) | |||
1429 | pci_restore_state(pci); | 1429 | pci_restore_state(pci); |
1430 | pci_enable_device(pci); | 1430 | pci_enable_device(pci); |
1431 | request_irq(pci->irq, snd_es1938_interrupt, | 1431 | request_irq(pci->irq, snd_es1938_interrupt, |
1432 | SA_INTERRUPT|SA_SHIRQ, "ES1938", chip); | 1432 | IRQF_DISABLED|IRQF_SHARED, "ES1938", chip); |
1433 | chip->irq = pci->irq; | 1433 | chip->irq = pci->irq; |
1434 | snd_es1938_chip_init(chip); | 1434 | snd_es1938_chip_init(chip); |
1435 | 1435 | ||
@@ -1544,7 +1544,7 @@ static int __devinit snd_es1938_create(struct snd_card *card, | |||
1544 | chip->vc_port = pci_resource_start(pci, 2); | 1544 | chip->vc_port = pci_resource_start(pci, 2); |
1545 | chip->mpu_port = pci_resource_start(pci, 3); | 1545 | chip->mpu_port = pci_resource_start(pci, 3); |
1546 | chip->game_port = pci_resource_start(pci, 4); | 1546 | chip->game_port = pci_resource_start(pci, 4); |
1547 | if (request_irq(pci->irq, snd_es1938_interrupt, SA_INTERRUPT|SA_SHIRQ, | 1547 | if (request_irq(pci->irq, snd_es1938_interrupt, IRQF_DISABLED|IRQF_SHARED, |
1548 | "ES1938", chip)) { | 1548 | "ES1938", chip)) { |
1549 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 1549 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
1550 | snd_es1938_free(chip); | 1550 | snd_es1938_free(chip); |