2.6.38-stable review patch.  If anyone has any objections, please let us know.

------------------

From: Vasily Khoruzhick <[email protected]>

commit 64c25a92e865f06ad8782fbdaa1e2a97d50acf73 upstream.

MONO was renamed to MONO1.

Signed-off-by: Vasily Khoruzhick <[email protected]>
Acked-by: Liam Girdwood <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 sound/soc/pxa/z2.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/sound/soc/pxa/z2.c
+++ b/sound/soc/pxa/z2.c
@@ -147,7 +147,7 @@ static int z2_wm8750_init(struct snd_soc
        snd_soc_dapm_disable_pin(dapm, "LINPUT3");
        snd_soc_dapm_disable_pin(dapm, "RINPUT3");
        snd_soc_dapm_disable_pin(dapm, "OUT3");
-       snd_soc_dapm_disable_pin(dapm, "MONO");
+       snd_soc_dapm_disable_pin(dapm, "MONO1");
 
        /* Add z2 specific widgets */
        snd_soc_dapm_new_controls(dapm, wm8750_dapm_widgets,


_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable

Reply via email to