summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-27 17:24:18 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-02 11:27:01 +0100
commit36c6b54cb0ec1908bc98c4d2d3b8584219f4d532 (patch)
treea67b12ecb562556858f37f57001b38c9dccdafb3 /sound/soc/codecs
parentASoC: Make WM5100 tone generator widgets signal generators (diff)
downloadlinux-36c6b54cb0ec1908bc98c4d2d3b8584219f4d532.tar.xz
linux-36c6b54cb0ec1908bc98c4d2d3b8584219f4d532.zip
ASoC: Make WM8962 beep a signal generator
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r--sound/soc/codecs/wm8962.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 8810988522eb..be35b6468cb1 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -2675,7 +2675,7 @@ SND_SOC_DAPM_INPUT("IN3L"),
SND_SOC_DAPM_INPUT("IN3R"),
SND_SOC_DAPM_INPUT("IN4L"),
SND_SOC_DAPM_INPUT("IN4R"),
-SND_SOC_DAPM_INPUT("Beep"),
+SND_SOC_DAPM_SIGGEN("Beep"),
SND_SOC_DAPM_INPUT("DMICDAT"),
SND_SOC_DAPM_SUPPLY("MICBIAS", WM8962_PWR_MGMT_1, 1, 0, NULL, 0),