diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-22 01:23:44 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-22 01:23:44 +0200 |
| commit | e3ac3f2510e5adb62eb4296d3fd0fac5441b2037 (patch) | |
| tree | 1c6ef3f82fbd8f77129beb3c411c4b8bf2edd60c /sound/soc/codecs/adav80x.c | |
| parent | Merge remote-tracking branch 'asoc/topic/dt' into asoc-next (diff) | |
| parent | ASoC: wm8997: Fix compile error (diff) | |
| download | linux-e3ac3f2510e5adb62eb4296d3fd0fac5441b2037.tar.xz linux-e3ac3f2510e5adb62eb4296d3fd0fac5441b2037.zip | |
Merge remote-tracking branch 'asoc/topic/enum' into asoc-next
Diffstat (limited to 'sound/soc/codecs/adav80x.c')
| -rw-r--r-- | sound/soc/codecs/adav80x.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/adav80x.c b/sound/soc/codecs/adav80x.c index cf170b5ef426..c43b93fdf0df 100644 --- a/sound/soc/codecs/adav80x.c +++ b/sound/soc/codecs/adav80x.c @@ -172,14 +172,14 @@ static ADAV80X_MUX_ENUM_DECL(adav80x_capture_enum, ADAV80X_DPATH_CTRL1, 3); static ADAV80X_MUX_ENUM_DECL(adav80x_dac_enum, ADAV80X_DPATH_CTRL2, 3); static const struct snd_kcontrol_new adav80x_aux_capture_mux_ctrl = - SOC_DAPM_VALUE_ENUM("Route", adav80x_aux_capture_enum); + SOC_DAPM_ENUM("Route", adav80x_aux_capture_enum); static const struct snd_kcontrol_new adav80x_capture_mux_ctrl = - SOC_DAPM_VALUE_ENUM("Route", adav80x_capture_enum); + SOC_DAPM_ENUM("Route", adav80x_capture_enum); static const struct snd_kcontrol_new adav80x_dac_mux_ctrl = - SOC_DAPM_VALUE_ENUM("Route", adav80x_dac_enum); + SOC_DAPM_ENUM("Route", adav80x_dac_enum); #define ADAV80X_MUX(name, ctrl) \ - SND_SOC_DAPM_VALUE_MUX(name, SND_SOC_NOPM, 0, 0, ctrl) + SND_SOC_DAPM_MUX(name, SND_SOC_NOPM, 0, 0, ctrl) static const struct snd_soc_dapm_widget adav80x_dapm_widgets[] = { SND_SOC_DAPM_DAC("DAC", NULL, ADAV80X_DAC_CTRL1, 7, 1), |