diff --git a/[refs] b/[refs]
index acd44b23de8a..bec0148618ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 392abe9cb36f04ccdda9c96938077b0d43f2b50b
+refs/heads/master: 3c17279137bf8318438510b48229d4236f773da4
diff --git a/trunk/sound/soc/omap/n810.c b/trunk/sound/soc/omap/n810.c
index 83b1eb4e40f3..6533563a6011 100644
--- a/trunk/sound/soc/omap/n810.c
+++ b/trunk/sound/soc/omap/n810.c
@@ -188,8 +188,8 @@ static const char *audio_map[][3] = {
 static const char *spk_function[] = {"Off", "On"};
 static const char *jack_function[] = {"Off", "Headphone"};
 static const struct soc_enum n810_enum[] = {
-	SOC_ENUM_SINGLE_EXT(2, spk_function),
-	SOC_ENUM_SINGLE_EXT(3, jack_function),
+	SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(spk_function), spk_function),
+	SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(jack_function), jack_function),
 };
 
 static const struct snd_kcontrol_new aic33_n810_controls[] = {