Merge remote-tracking branch 'asoc/topic/lm4857' into asoc-next

d4cb542a · Mark Brown · 5881af77 · 6415e307 · d4cb542a
Commit d4cb542a authored Mar 13, 2014 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

sound/soc/codecs/lm4857.c sound/soc/codecs/lm4857.c +1 -2

No files found.
--- a/sound/soc/codecs/lm4857.c
+++ b/sound/soc/codecs/lm4857.c
@@ -101,8 +101,7 @@ static const char *lm4857_mode[] = {
 	"Headphone",
 };

-static const struct soc_enum lm4857_mode_enum =
-	SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(lm4857_mode), lm4857_mode);
+static SOC_ENUM_SINGLE_EXT_DECL(lm4857_mode_enum, lm4857_mode);

 static const struct snd_soc_dapm_widget lm4857_dapm_widgets[] = {
 	SND_SOC_DAPM_INPUT("IN"),