aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-04-21 12:44:38 +0200
committerTakashi Iwai <tiwai@suse.de>2011-04-21 12:44:38 +0200
commit6a9a6f233baad76b67a448b39bb55fc064755ba4 (patch)
tree71557def09bb57e2a05d20e939d4824fbad59093 /Documentation
parentb3c27b51db9112d03864fdef44fa611dd69c1425 (diff)
parent1c7276cfc04b1a5b296b691c2e07297a4f6c19aa (diff)
downloadkernel_samsung_tuna-6a9a6f233baad76b67a448b39bb55fc064755ba4.zip
kernel_samsung_tuna-6a9a6f233baad76b67a448b39bb55fc064755ba4.tar.gz
kernel_samsung_tuna-6a9a6f233baad76b67a448b39bb55fc064755ba4.tar.bz2
Merge branch 'fix/hda' into for-linus
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/sound/alsa/SB-Live-mixer.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/sound/alsa/SB-Live-mixer.txt b/Documentation/sound/alsa/SB-Live-mixer.txt
index f5639d4..f4b5988 100644
--- a/Documentation/sound/alsa/SB-Live-mixer.txt
+++ b/Documentation/sound/alsa/SB-Live-mixer.txt
@@ -87,14 +87,14 @@ accumulator. ALSA uses accumulators 0 and 1 for left and right PCM.
The result is forwarded to the ADC capture FIFO (thus to the standard capture
PCM device).
-name='Music Playback Volume',index=0
+name='Synth Playback Volume',index=0
This control is used to attenuate samples for left and right MIDI FX-bus
accumulators. ALSA uses accumulators 4 and 5 for left and right MIDI samples.
The result samples are forwarded to the front DAC PCM slots of the AC97 codec.
-name='Music Capture Volume',index=0
-name='Music Capture Switch',index=0
+name='Synth Capture Volume',index=0
+name='Synth Capture Switch',index=0
These controls are used to attenuate samples for left and right MIDI FX-bus
accumulator. ALSA uses accumulators 4 and 5 for left and right PCM.