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/isa/sscape.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/isa/sscape.c')
| -rw-r--r-- | sound/isa/sscape.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c index e2d5d2d3ed96..f2379e102b63 100644 --- a/sound/isa/sscape.c +++ b/sound/isa/sscape.c @@ -825,8 +825,7 @@ static int __devinit create_mpu401(struct snd_card *card, int devnum, int err; err = snd_mpu401_uart_new(card, devnum, MPU401_HW_MPU401, port, - MPU401_INFO_INTEGRATED, irq, IRQF_DISABLED, - &rawmidi); + MPU401_INFO_INTEGRATED, irq, &rawmidi); if (err == 0) { struct snd_mpu401 *mpu = rawmidi->private_data; mpu->open_input = mpu401_open; |