diff options
Diffstat (limited to 'sound/soc/codecs/wm5100.c')
-rw-r--r-- | sound/soc/codecs/wm5100.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c index eca983fad891..91a9ea2a2056 100644 --- a/sound/soc/codecs/wm5100.c +++ b/sound/soc/codecs/wm5100.c | |||
@@ -390,7 +390,7 @@ static int wm5100_mixer_values[] = { | |||
390 | 390 | ||
391 | #define WM5100_MUX_CTL_DECL(name) \ | 391 | #define WM5100_MUX_CTL_DECL(name) \ |
392 | const struct snd_kcontrol_new name##_mux = \ | 392 | const struct snd_kcontrol_new name##_mux = \ |
393 | SOC_DAPM_VALUE_ENUM("Route", name##_enum) | 393 | SOC_DAPM_ENUM("Route", name##_enum) |
394 | 394 | ||
395 | #define WM5100_MIXER_ENUMS(name, base_reg) \ | 395 | #define WM5100_MIXER_ENUMS(name, base_reg) \ |
396 | static WM5100_MUX_ENUM_DECL(name##_in1_enum, base_reg); \ | 396 | static WM5100_MUX_ENUM_DECL(name##_in1_enum, base_reg); \ |
@@ -448,7 +448,7 @@ WM5100_MIXER_ENUMS(LHPF3, WM5100_HPLP3MIX_INPUT_1_SOURCE); | |||
448 | WM5100_MIXER_ENUMS(LHPF4, WM5100_HPLP4MIX_INPUT_1_SOURCE); | 448 | WM5100_MIXER_ENUMS(LHPF4, WM5100_HPLP4MIX_INPUT_1_SOURCE); |
449 | 449 | ||
450 | #define WM5100_MUX(name, ctrl) \ | 450 | #define WM5100_MUX(name, ctrl) \ |
451 | SND_SOC_DAPM_VALUE_MUX(name, SND_SOC_NOPM, 0, 0, ctrl) | 451 | SND_SOC_DAPM_MUX(name, SND_SOC_NOPM, 0, 0, ctrl) |
452 | 452 | ||
453 | #define WM5100_MIXER_WIDGETS(name, name_str) \ | 453 | #define WM5100_MIXER_WIDGETS(name, name_str) \ |
454 | WM5100_MUX(name_str " Input 1", &name##_in1_mux), \ | 454 | WM5100_MUX(name_str " Input 1", &name##_in1_mux), \ |