Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[~andy/linux] / sound / isa / msnd / msnd_pinnacle.c

diff --git a/sound/isa/msnd/msnd_pinnacle.c b/sound/isa/msnd/msnd_pinnacle.c
index 91d6023a63e57c6b14227e158c171b8edf4b8087..0961e2cf20caa8c0697f4775e0621ad0540af242 100644 (file)
--- a/sound/isa/msnd/msnd_pinnacle.c
+++ b/sound/isa/msnd/msnd_pinnacle.c
@@ -600,7 +600,7 @@ static int __devinit snd_msnd_attach(struct snd_card *card)
                                          mpu_io[0],
                                          MPU401_MODE_INPUT |
                                          MPU401_MODE_OUTPUT,
-                                         mpu_irq[0], IRQF_DISABLED,
+                                         mpu_irq[0],
                                          &chip->rmidi);
                if (err < 0) {
                        printk(KERN_ERR LOGNAME