Merge branch 'from-linus' into upstream

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

diff --git a/sound/oss/maestro3.c b/sound/oss/maestro3.c
index 4a5e4237a1106af30e0c7e08a93002bf6981e848..5548e3cff7ceb4476cd75263ab54cccc01f637f9 100644 (file)
--- a/sound/oss/maestro3.c
+++ b/sound/oss/maestro3.c
@@ -2694,7 +2694,7 @@ static int __devinit m3_probe(struct pci_dev *pci_dev, const struct pci_device_i
         }
     }
     
-    if(request_irq(card->irq, m3_interrupt, SA_SHIRQ, card_names[card->card_type], card)) {
+    if(request_irq(card->irq, m3_interrupt, IRQF_SHARED, card_names[card->card_type], card)) {
 
         printk(KERN_ERR PFX "unable to allocate irq %d,\n", card->irq);