diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:53 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:53 -0400 |
| commit | b5c784894c90042f4fc6348aedc7524e899df281 (patch) | |
| tree | 0db86a93d73e4aabca04e361d7e6807aa4c1d307 /Documentation/sound | |
| parent | ff4fc3656e489ed6ee575959b0510286aefe1e20 (diff) | |
| parent | 1f2186951e02f2a5bcda9459f63136918932385a (diff) | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'Documentation/sound')
| -rw-r--r-- | Documentation/sound/alsa/soc/dapm.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/sound/alsa/soc/dapm.txt b/Documentation/sound/alsa/soc/dapm.txt index 46f9684d0b29..9e6763264a2e 100644 --- a/Documentation/sound/alsa/soc/dapm.txt +++ b/Documentation/sound/alsa/soc/dapm.txt | |||
| @@ -116,6 +116,9 @@ SOC_DAPM_SINGLE("HiFi Playback Switch", WM8731_APANA, 4, 1, 0), | |||
| 116 | SND_SOC_DAPM_MIXER("Output Mixer", WM8731_PWR, 4, 1, wm8731_output_mixer_controls, | 116 | SND_SOC_DAPM_MIXER("Output Mixer", WM8731_PWR, 4, 1, wm8731_output_mixer_controls, |
| 117 | ARRAY_SIZE(wm8731_output_mixer_controls)), | 117 | ARRAY_SIZE(wm8731_output_mixer_controls)), |
| 118 | 118 | ||
| 119 | If you dont want the mixer elements prefixed with the name of the mixer widget, | ||
| 120 | you can use SND_SOC_DAPM_MIXER_NAMED_CTL instead. the parameters are the same | ||
| 121 | as for SND_SOC_DAPM_MIXER. | ||
| 119 | 122 | ||
| 120 | 2.3 Platform/Machine domain Widgets | 123 | 2.3 Platform/Machine domain Widgets |
| 121 | ----------------------------------- | 124 | ----------------------------------- |