diff options
| author | Mark Brown <broonie@kernel.org> | 2015-04-12 19:48:21 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-12 19:48:21 +0100 |
| commit | a37a9407ca3cec1f9218657eaec43814db1673f6 (patch) | |
| tree | 7c3709b4493e373d7cfa2ccd9b93cad337f0b639 /Documentation | |
| parent | a55ede1661268c1a6fe94078b7b08906dfa7b77a (diff) | |
| parent | cd02e3df529eb3fbf8904ba60a617f6217ac7629 (diff) | |
Merge remote-tracking branch 'asoc/fix/pcm512x' into asoc-linus
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/sound/alsa/ControlNames.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/sound/alsa/ControlNames.txt b/Documentation/sound/alsa/ControlNames.txt index 79a6127863ca..3fc1cf50d28e 100644 --- a/Documentation/sound/alsa/ControlNames.txt +++ b/Documentation/sound/alsa/ControlNames.txt @@ -71,11 +71,11 @@ SOURCE: HDMI/DP (either HDMI or DisplayPort) Exceptions (deprecated): - [Digital] Capture Source - [Digital] Capture Switch (aka input gain switch) - [Digital] Capture Volume (aka input gain volume) - [Digital] Playback Switch (aka output gain switch) - [Digital] Playback Volume (aka output gain volume) + [Analogue|Digital] Capture Source + [Analogue|Digital] Capture Switch (aka input gain switch) + [Analogue|Digital] Capture Volume (aka input gain volume) + [Analogue|Digital] Playback Switch (aka output gain switch) + [Analogue|Digital] Playback Volume (aka output gain volume) Tone Control - Switch Tone Control - Bass Tone Control - Treble |