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

[linux-2.6-omap-h63xx.git] / sound / oss / es1370.c

diff --git a/sound/oss/es1370.c b/sound/oss/es1370.c
index 094f569cc6e07cb545b68e29bc2f4bfa37a06af5..13f4831497374535f7afe6acbf1155d69da8f4cb 100644 (file)
--- a/sound/oss/es1370.c
+++ b/sound/oss/es1370.c
@@ -2650,7 +2650,7 @@ static int __devinit es1370_probe(struct pci_dev *pcidev, const struct pci_devic
                ret = -EBUSY;
                goto err_region;
        }
-       if ((ret=request_irq(s->irq, es1370_interrupt, SA_SHIRQ, "es1370",s))) {
+       if ((ret=request_irq(s->irq, es1370_interrupt, IRQF_SHARED, "es1370",s))) {
                printk(KERN_ERR "es1370: irq %u in use\n", s->irq);
                goto err_irq;
        }