diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-08-25 18:40:29 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-08-25 18:40:29 -0400 |
| commit | e8a2eb47e6ca03d4a4f98f0beef73720c5dddc0c (patch) | |
| tree | 31c4d7718111abddfaaa8d3fb14ab4a7e2554cd9 /sound/oss/mpu401.c | |
| parent | 8b5a10fc6fd02289ea03480f93382b1a99006142 (diff) | |
| parent | c62e43202e7cf50ca24bce58b255df7bf5de69d0 (diff) | |
Merge commit 'origin/x86/urgent' into x86/asm
Diffstat (limited to 'sound/oss/mpu401.c')
| -rw-r--r-- | sound/oss/mpu401.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/mpu401.c b/sound/oss/mpu401.c index 1b2316f35b1..734b8f9e2f7 100644 --- a/sound/oss/mpu401.c +++ b/sound/oss/mpu401.c | |||
| @@ -1074,7 +1074,7 @@ int attach_mpu401(struct address_info *hw_config, struct module *owner) | |||
| 1074 | sprintf(mpu_synth_info[m].name, "%s (MPU401)", hw_config->name); | 1074 | sprintf(mpu_synth_info[m].name, "%s (MPU401)", hw_config->name); |
| 1075 | else | 1075 | else |
| 1076 | sprintf(mpu_synth_info[m].name, | 1076 | sprintf(mpu_synth_info[m].name, |
| 1077 | "MPU-401 %d.%d%c Midi interface #%d", | 1077 | "MPU-401 %d.%d%c MIDI #%d", |
| 1078 | (int) (devc->version & 0xf0) >> 4, | 1078 | (int) (devc->version & 0xf0) >> 4, |
| 1079 | devc->version & 0x0f, | 1079 | devc->version & 0x0f, |
| 1080 | revision_char, | 1080 | revision_char, |