Merge branch 'master' into gfs2

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

diff --git a/sound/oss/forte.c b/sound/oss/forte.c
index 44e578098d76e77768ea6a872ff077eb5e89be85..ea1c0207aef2f45bc466a504c898a1eda1cd4362 100644 (file)
--- a/sound/oss/forte.c
+++ b/sound/oss/forte.c
@@ -2026,7 +2026,7 @@ forte_probe (struct pci_dev *pci_dev, const struct pci_device_id *pci_id)
        chip->iobase = pci_resource_start (pci_dev, 0);
        chip->irq = pci_dev->irq;
 
-       if (request_irq (chip->irq, forte_interrupt, SA_SHIRQ, DRIVER_NAME,
+       if (request_irq (chip->irq, forte_interrupt, IRQF_SHARED, DRIVER_NAME,
                         chip)) {
                printk (KERN_WARNING PFX "Unable to reserve IRQ");
                ret = -EIO;