Merge branch 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / sound / sparc / cs4231.c

diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index 44ad9616bf63a39d4df41e45440284fddc488604..5018fcf41df5883b7cbb722b28a1181d8dfe07b1 100644 (file)
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -2001,7 +2001,7 @@ static int __init snd_cs4231_sbus_create(struct snd_card *card,
        chip->c_dma.preallocate = sbus_dma_preallocate;
 
        if (request_irq(sdev->irqs[0], snd_cs4231_sbus_interrupt,
-                       SA_SHIRQ, "cs4231", chip)) {
+                       IRQF_SHARED, "cs4231", chip)) {
                snd_printdd("cs4231-%d: Unable to grab SBUS IRQ %d\n",
                            dev, sdev->irqs[0]);
                snd_cs4231_sbus_free(chip);