diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-11-13 14:55:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-11-13 14:55:53 -0500 |
| commit | 2290c0d06d82faee87b1ab2d9d4f7bf81ef64379 (patch) | |
| tree | e075e4d5534193f28e6059904f61e5ca03958d3c /sound/isa/msnd/msnd_pinnacle.c | |
| parent | 4da669a2e3e5bc70b30a0465f3641528681b5f77 (diff) | |
| parent | 52e4c2a05256cb83cda12f3c2137ab1533344edb (diff) | |
Merge branch 'master' into for-next
Sync with Linus tree to have 157550ff ("mtd: add GPMI-NAND driver
in the config and Makefile") as I have patch depending on that one.
Diffstat (limited to 'sound/isa/msnd/msnd_pinnacle.c')
| -rw-r--r-- | sound/isa/msnd/msnd_pinnacle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/isa/msnd/msnd_pinnacle.c b/sound/isa/msnd/msnd_pinnacle.c index 91d6023a63e..0961e2cf20c 100644 --- 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) | |||
| 600 | mpu_io[0], | 600 | mpu_io[0], |
| 601 | MPU401_MODE_INPUT | | 601 | MPU401_MODE_INPUT | |
| 602 | MPU401_MODE_OUTPUT, | 602 | MPU401_MODE_OUTPUT, |
| 603 | mpu_irq[0], IRQF_DISABLED, | 603 | mpu_irq[0], |
| 604 | &chip->rmidi); | 604 | &chip->rmidi); |
| 605 | if (err < 0) { | 605 | if (err < 0) { |
| 606 | printk(KERN_ERR LOGNAME | 606 | printk(KERN_ERR LOGNAME |