diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-27 22:47:51 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-27 22:47:51 -0400 |
| commit | 0e9882b4fb8703f13921279fe4a6592574f92c62 (patch) | |
| tree | 001ea9826ec3011e19986eb81cc7597d58f4f999 /sound/soc/pxa/z2.c | |
| parent | c4bb07ec0084e26323047bcbe446d59ac352e07f (diff) | |
| parent | 24d6a9d07f7da6c635530688a43086ea293bf9dc (diff) | |
Merge commit 'v2.6.38.1' into linaro-2.6.38
Conflicts:
drivers/usb/core/hcd-pci.c
drivers/usb/host/isp1760-hcd.c
include/linux/usb/ch9.h
Diffstat (limited to 'sound/soc/pxa/z2.c')
| -rw-r--r-- | sound/soc/pxa/z2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c index 3ceaef68e01..838a0d540c5 100644 --- a/sound/soc/pxa/z2.c +++ b/sound/soc/pxa/z2.c @@ -147,7 +147,7 @@ static int z2_wm8750_init(struct snd_soc_pcm_runtime *rtd) 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, |