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/sb/jazz16.c | |
parent | ALSA: hda - Fix pin-config for ASUS W90V (diff) | |
parent | ALSA: Update the sound git tree URL (diff) | |
download | linux-d22665702226e9c40bc331098559e3d55e7cd43d.tar.xz linux-d22665702226e9c40bc331098559e3d55e7cd43d.zip |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/isa/sb/jazz16.c')
-rw-r--r-- | sound/isa/sb/jazz16.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/isa/sb/jazz16.c b/sound/isa/sb/jazz16.c index 8ccbcddf08e1..54e3c2c18060 100644 --- a/sound/isa/sb/jazz16.c +++ b/sound/isa/sb/jazz16.c @@ -322,7 +322,6 @@ static int __devinit snd_jazz16_probe(struct device *devptr, unsigned int dev) MPU401_HW_MPU401, mpu_port[dev], 0, mpu_irq[dev], - mpu_irq[dev] >= 0 ? IRQF_DISABLED : 0, NULL) < 0) snd_printk(KERN_ERR "no MPU-401 device at 0x%lx\n", mpu_port[dev]); |