Merge branch 'upstream' into pata-drivers

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

diff --git a/sound/oss/sb_common.c b/sound/oss/sb_common.c
index 3e8ecac86a894e11e604b2e03d913dd8f70da152..35bab6e2f998a7f87442c99168715630750681ed 100644 (file)
--- a/sound/oss/sb_common.c
+++ b/sound/oss/sb_common.c
@@ -677,7 +677,7 @@ int sb_dsp_init(struct address_info *hw_config, struct module *owner)
                 *      will get shared PCI irq lines we must cope.
                 */
                 
-               int i=(devc->caps&SB_PCI_IRQ)?SA_SHIRQ:0;
+               int i=(devc->caps&SB_PCI_IRQ)?IRQF_SHARED:0;
                
                if (request_irq(hw_config->irq, sbintr, i, "soundblaster", devc) < 0)
                {