diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-13 10:19:35 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-13 10:19:35 -0400 |
| commit | d4cb542ac253e6cc910da8c0bc381ca072358604 (patch) | |
| tree | a1512c583b499ccb3074974dc767928d39f2d78b | |
| parent | 5881af77082924fe56a23b5bcc9823f906780772 (diff) | |
| parent | 6415e307b1d270e4e5f7ee7bd9aac4ac4f1daf65 (diff) | |
Merge remote-tracking branch 'asoc/topic/lm4857' into asoc-next
| -rw-r--r-- | sound/soc/codecs/lm4857.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/codecs/lm4857.c b/sound/soc/codecs/lm4857.c index 0e5743ea79df..4f048db9f55f 100644 --- a/sound/soc/codecs/lm4857.c +++ b/sound/soc/codecs/lm4857.c | |||
| @@ -101,8 +101,7 @@ static const char *lm4857_mode[] = { | |||
| 101 | "Headphone", | 101 | "Headphone", |
| 102 | }; | 102 | }; |
| 103 | 103 | ||
| 104 | static const struct soc_enum lm4857_mode_enum = | 104 | static SOC_ENUM_SINGLE_EXT_DECL(lm4857_mode_enum, lm4857_mode); |
| 105 | SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(lm4857_mode), lm4857_mode); | ||
| 106 | 105 | ||
| 107 | static const struct snd_soc_dapm_widget lm4857_dapm_widgets[] = { | 106 | static const struct snd_soc_dapm_widget lm4857_dapm_widgets[] = { |
| 108 | SND_SOC_DAPM_INPUT("IN"), | 107 | SND_SOC_DAPM_INPUT("IN"), |