diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-15 19:43:29 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-15 19:43:29 -0500 |
| commit | 3f02d072d46bb409e8ca3cf16c0511f5c21adaf6 (patch) | |
| tree | baec074db38a5ceaaabbcee76f199acef43bb42a /sound/oss | |
| parent | 0238cb4e7583c521bb3538060f98a73e65f61324 (diff) | |
| parent | fb453d4b0b51ea71c9eb8192c61b768afeb7ee8a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'sound/oss')
| -rw-r--r-- | sound/oss/opl3sa2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/opl3sa2.c b/sound/oss/opl3sa2.c index 5cecdbcbea9d..0e161c6a0477 100644 --- a/sound/oss/opl3sa2.c +++ b/sound/oss/opl3sa2.c | |||
| @@ -530,7 +530,7 @@ static void __init attach_opl3sa2_mss(struct address_info* hw_config, struct res | |||
| 530 | if (hw_config->slots[0] != -1) { | 530 | if (hw_config->slots[0] != -1) { |
| 531 | /* Did the MSS driver install? */ | 531 | /* Did the MSS driver install? */ |
| 532 | if(num_mixers == (initial_mixers + 1)) { | 532 | if(num_mixers == (initial_mixers + 1)) { |
| 533 | /* The MSS mixer is installed, reroute mixers appropiately */ | 533 | /* The MSS mixer is installed, reroute mixers appropriately */ |
| 534 | AD1848_REROUTE(SOUND_MIXER_LINE1, SOUND_MIXER_CD); | 534 | AD1848_REROUTE(SOUND_MIXER_LINE1, SOUND_MIXER_CD); |
| 535 | AD1848_REROUTE(SOUND_MIXER_LINE2, SOUND_MIXER_SYNTH); | 535 | AD1848_REROUTE(SOUND_MIXER_LINE2, SOUND_MIXER_SYNTH); |
| 536 | AD1848_REROUTE(SOUND_MIXER_LINE3, SOUND_MIXER_LINE); | 536 | AD1848_REROUTE(SOUND_MIXER_LINE3, SOUND_MIXER_LINE); |