Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[powerpc.git] / sound / oss / es1371.c

diff --git a/sound/oss/es1371.c b/sound/oss/es1371.c
index 4400c85..a2ffe72 100644 (file)
--- a/sound/oss/es1371.c
+++ b/sound/oss/es1371.c
@@ -2905,7 +2905,7 @@ static int __devinit es1371_probe(struct pci_dev *pcidev, const struct pci_devic
                res = -EBUSY;
                goto err_region;
        }
-       if ((res=request_irq(s->irq, es1371_interrupt, SA_SHIRQ, "es1371",s))) {
+       if ((res=request_irq(s->irq, es1371_interrupt, IRQF_SHARED, "es1371",s))) {
                printk(KERN_ERR PFX "irq %u in use\n", s->irq);
                goto err_irq;
        }