Merge branch 'upstream-greg' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git...

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

diff --git a/sound/oss/ite8172.c b/sound/oss/ite8172.c
index ffcb910f5c3e16637b9afa6811a52db1b6544dfb..68aab3605d74572cf27f59c66b37a28c9acdb5a7 100644 (file)
--- a/sound/oss/ite8172.c
+++ b/sound/oss/ite8172.c
@@ -1968,9 +1968,9 @@ static int i2s_fmt[NR_DEVICE];
 
 static unsigned int devindex;
 
-MODULE_PARM(spdif, "1-" __MODULE_STRING(NR_DEVICE) "i");
+module_param_array(spdif, int, NULL, 0);
 MODULE_PARM_DESC(spdif, "if 1 the S/PDIF digital output is enabled");
-MODULE_PARM(i2s_fmt, "1-" __MODULE_STRING(NR_DEVICE) "i");
+module_param_array(i2s_fmt, int, NULL, 0);
 MODULE_PARM_DESC(i2s_fmt, "the format of I2S");
 
 MODULE_AUTHOR("Monta Vista Software, stevel@mvista.com");
@@ -2019,7 +2019,7 @@ static int __devinit it8172_probe(struct pci_dev *pcidev,
                    s->io, s->io + pci_resource_len(pcidev,0)-1);
                goto err_region;
        }
-       if (request_irq(s->irq, it8172_interrupt, SA_INTERRUPT,
+       if (request_irq(s->irq, it8172_interrupt, IRQF_DISABLED,
                        IT8172_MODULE_NAME, s)) {
                err("irq %u in use", s->irq);
                goto err_irq;