diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-03 13:08:59 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-03 13:08:59 -0500 |
| commit | d930f0082d30d916e2824ecbcb6d2833607ef696 (patch) | |
| tree | 458bacf0efa74371aa1bda289ed5a96f31743962 | |
| parent | 1c4b578aa4ea2ef98871dc8ad95acb1fa14f9bcd (diff) | |
| parent | faf6615bf05bc5cecc6e22013b9cb21c77784fd1 (diff) | |
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
| -rw-r--r-- | include/sound/soc-dapm.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 2037c45adfe6..56ebdfca6273 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h | |||
| @@ -104,7 +104,8 @@ struct device; | |||
| 104 | SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \ | 104 | SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \ |
| 105 | .kcontrol_news = wcontrols, .num_kcontrols = 1} | 105 | .kcontrol_news = wcontrols, .num_kcontrols = 1} |
| 106 | #define SND_SOC_DAPM_MUX(wname, wreg, wshift, winvert, wcontrols) \ | 106 | #define SND_SOC_DAPM_MUX(wname, wreg, wshift, winvert, wcontrols) \ |
| 107 | { .id = snd_soc_dapm_mux, .name = wname, .reg = wreg, \ | 107 | { .id = snd_soc_dapm_mux, .name = wname, \ |
| 108 | SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \ | ||
| 108 | .kcontrol_news = wcontrols, .num_kcontrols = 1} | 109 | .kcontrol_news = wcontrols, .num_kcontrols = 1} |
| 109 | #define SND_SOC_DAPM_VIRT_MUX(wname, wreg, wshift, winvert, wcontrols) \ | 110 | #define SND_SOC_DAPM_VIRT_MUX(wname, wreg, wshift, winvert, wcontrols) \ |
| 110 | { .id = snd_soc_dapm_virt_mux, .name = wname, \ | 111 | { .id = snd_soc_dapm_virt_mux, .name = wname, \ |