Merge branch 'from-linus' into upstream

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

diff --git a/sound/oss/au1000.c b/sound/oss/au1000.c
index fe54de25aafc400b2fbb60117b125c79b1385658..e3796231452afcd34eac9a93dd87682e91845eb4 100644 (file)
--- a/sound/oss/au1000.c
+++ b/sound/oss/au1000.c
@@ -100,7 +100,7 @@
 
 /* Boot options */
 static int      vra = 0;       // 0 = no VRA, 1 = use VRA if codec supports it
-MODULE_PARM(vra, "i");
+module_param(vra, bool, 0);
 MODULE_PARM_DESC(vra, "if 1 use VRA if codec supports it");
 
 
@@ -2015,14 +2015,14 @@ static int __devinit au1000_probe(void)
        if ((s->dma_dac.dmanr = request_au1000_dma(DMA_ID_AC97C_TX,
                                                   "audio DAC",
                                                   dac_dma_interrupt,
-                                                  SA_INTERRUPT, s)) < 0) {
+                                                  IRQF_DISABLED, s)) < 0) {
                err("Can't get DAC DMA");
                goto err_dma1;
        }
        if ((s->dma_adc.dmanr = request_au1000_dma(DMA_ID_AC97C_RX,
                                                   "audio ADC",
                                                   adc_dma_interrupt,
-                                                  SA_INTERRUPT, s)) < 0) {
+                                                  IRQF_DISABLED, s)) < 0) {
                err("Can't get ADC DMA");
                goto err_dma2;
        }