summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-02-05 12:43:50 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-02-05 12:43:50 +0000
commit4f2c120d1860ce33a71c617f59cf80c700b30d2a (patch)
tree471cacce67e584cff5ac97913f546f234fe40275 /sound
parentcb67286d6629ecb5bfc44071d664cf1cbd01a350 (diff)
parent3b9447fb7fa1829731290e64ef928d4f6461310a (diff)
downloadop-kernel-dev-4f2c120d1860ce33a71c617f59cf80c700b30d2a.zip
op-kernel-dev-4f2c120d1860ce33a71c617f59cf80c700b30d2a.tar.gz
Merge branch 'for-2.6.33' into for-2.6.34
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/omap/omap3pandora.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c
index 71b2c16..68980c1 100644
--- a/sound/soc/omap/omap3pandora.c
+++ b/sound/soc/omap/omap3pandora.c
@@ -145,6 +145,7 @@ static const struct snd_soc_dapm_widget omap3pandora_in_dapm_widgets[] = {
};
static const struct snd_soc_dapm_route omap3pandora_out_map[] = {
+ {"PCM DAC", NULL, "APLL Enable"},
{"Headphone Amplifier", NULL, "PCM DAC"},
{"Line Out", NULL, "PCM DAC"},
{"Headphone Jack", NULL, "Headphone Amplifier"},
OpenPOWER on IntegriCloud