[GFS2] Fix up merge of Linus' kernel into GFS2

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

diff --git a/sound/oss/trident.c b/sound/oss/trident.c
index 420a866fb93387e688706c62b7b863311ac1a7cd..2813e4c8e365aafb6bc6b364b671c8d2e4720b10 100644 (file)
--- a/sound/oss/trident.c
+++ b/sound/oss/trident.c
@@ -4472,7 +4472,7 @@ trident_probe(struct pci_dev *pci_dev, const struct pci_device_id *pci_id)
 
        /* claim our irq */
        rc = -ENODEV;
-       if (request_irq(card->irq, &trident_interrupt, SA_SHIRQ, 
+       if (request_irq(card->irq, &trident_interrupt, IRQF_SHARED,
                        card_names[pci_id->driver_data], card)) {
                printk(KERN_ERR "trident: unable to allocate irq %d\n", 
                       card->irq);