diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-10-26 23:51:43 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-10-26 23:51:43 +0200 |
| commit | d22665702226e9c40bc331098559e3d55e7cd43d (patch) | |
| tree | 6e92734c9835dc9e064b20182624939f3486d28d /sound/pci/riptide/riptide.c | |
| parent | 5cdf745ebae0f5bcf9b798d8fd5cb57add592cc1 (diff) | |
| parent | dde7ad8dee274763c8958769779aea8c993c950e (diff) | |
| download | linux-d22665702226e9c40bc331098559e3d55e7cd43d.tar.gz linux-d22665702226e9c40bc331098559e3d55e7cd43d.tar.xz | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/riptide/riptide.c')
| -rw-r--r-- | sound/pci/riptide/riptide.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c index e34ae14908b3..88cc776aa38b 100644 --- a/sound/pci/riptide/riptide.c +++ b/sound/pci/riptide/riptide.c @@ -2109,7 +2109,7 @@ snd_card_riptide_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) val = mpu_port[dev]; pci_write_config_word(chip->pci, PCI_EXT_MPU_Base, val); err = snd_mpu401_uart_new(card, 0, MPU401_HW_RIPTIDE, - val, 0, chip->irq, 0, + val, MPU401_INFO_IRQ_HOOK, -1, &chip->rmidi); if (err < 0) snd_printk(KERN_WARNING |