diff options
author | Mark Brown <broonie@linaro.org> | 2014-05-22 00:23:44 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-05-22 00:23:44 +0100 |
commit | e3ac3f2510e5adb62eb4296d3fd0fac5441b2037 (patch) | |
tree | 1c6ef3f82fbd8f77129beb3c411c4b8bf2edd60c /sound/soc/codecs/pcm512x.c | |
parent | 566d4eeff85a8112dddab9d455322e1fcf5defe7 (diff) | |
parent | 9de98da2a7531ec9dedfbe95d69ee55237bbd9d5 (diff) | |
download | talos-op-linux-e3ac3f2510e5adb62eb4296d3fd0fac5441b2037.tar.gz talos-op-linux-e3ac3f2510e5adb62eb4296d3fd0fac5441b2037.zip |
Merge remote-tracking branch 'asoc/topic/enum' into asoc-next
Diffstat (limited to 'sound/soc/codecs/pcm512x.c')
-rw-r--r-- | sound/soc/codecs/pcm512x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c index 4b4c0c7bb918..381d22ce6f76 100644 --- a/sound/soc/codecs/pcm512x.c +++ b/sound/soc/codecs/pcm512x.c @@ -269,7 +269,7 @@ SOC_DOUBLE("Playback Digital Switch", PCM512x_MUTE, PCM512x_RQML_SHIFT, PCM512x_RQMR_SHIFT, 1, 1), SOC_SINGLE("Deemphasis Switch", PCM512x_DSP, PCM512x_DEMP_SHIFT, 1, 1), -SOC_VALUE_ENUM("DSP Program", pcm512x_dsp_program), +SOC_ENUM("DSP Program", pcm512x_dsp_program), SOC_ENUM("Clock Missing Period", pcm512x_clk_missing), SOC_ENUM("Auto Mute Time Left", pcm512x_autom_l), |