diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-03-11 11:34:27 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-03-11 11:34:27 +0100 |
| commit | a02ed5e3e05ec5e8af21e645cccc77f3a6480aaf (patch) | |
| tree | 95a0df31b0c9b1e0357b8dd378e2eab637970df4 /sound/soc/codecs/wm8770.c | |
| parent | 2b3942e4bb20ef8ef26515bd958c2df83d9a6210 (diff) | |
| parent | 96b3d28bf4b00f62fc8386ff5d487d1830793a3d (diff) | |
| download | lwn-a02ed5e3e05ec5e8af21e645cccc77f3a6480aaf.tar.gz lwn-a02ed5e3e05ec5e8af21e645cccc77f3a6480aaf.zip | |
Merge branch 'sched/urgent' into sched/core
Pick up fixes before queueing up new changes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'sound/soc/codecs/wm8770.c')
| -rw-r--r-- | sound/soc/codecs/wm8770.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8770.c b/sound/soc/codecs/wm8770.c index 89a18d82f303..5bce21013485 100644 --- a/sound/soc/codecs/wm8770.c +++ b/sound/soc/codecs/wm8770.c @@ -196,8 +196,8 @@ static const char *ain_text[] = { "AIN5", "AIN6", "AIN7", "AIN8" }; -static const struct soc_enum ain_enum = - SOC_ENUM_DOUBLE(WM8770_ADCMUX, 0, 4, 8, ain_text); +static SOC_ENUM_DOUBLE_DECL(ain_enum, + WM8770_ADCMUX, 0, 4, ain_text); static const struct snd_kcontrol_new ain_mux = SOC_DAPM_ENUM("Capture Mux", ain_enum); |