fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / sound / oss / nec_vrc5477.c

diff --git a/sound/oss/nec_vrc5477.c b/sound/oss/nec_vrc5477.c
index 21c1954..da9728e 100644 (file)
--- a/sound/oss/nec_vrc5477.c
+++ b/sound/oss/nec_vrc5477.c
@@ -848,7 +848,7 @@ static inline void vrc5477_ac97_dac_interrupt(struct vrc5477_ac97_state *s)
                wake_up_interruptible(&dac->wait);
 }
 
-static irqreturn_t vrc5477_ac97_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t vrc5477_ac97_interrupt(int irq, void *dev_id)
 {
        struct vrc5477_ac97_state *s = (struct vrc5477_ac97_state *)dev_id;
        u32 irqStatus;
@@ -1909,7 +1909,7 @@ static int __devinit vrc5477_ac97_probe(struct pci_dev *pcidev,
                       s->io, s->io + pci_resource_len(pcidev,0)-1);
                goto err_region;
        }
-       if (request_irq(s->irq, vrc5477_ac97_interrupt, SA_INTERRUPT,
+       if (request_irq(s->irq, vrc5477_ac97_interrupt, IRQF_DISABLED,
                        VRC5477_AC97_MODULE_NAME, s)) {
                printk(KERN_ERR PFX "irq %u in use\n", s->irq);
                goto err_irq;