| commit | 4f2c120d1860ce33a71c617f59cf80c700b30d2a | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Fri Feb 05 12:43:50 2010 +0000 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Fri Feb 05 12:43:50 2010 +0000 |
| tree | 471cacce67e584cff5ac97913f546f234fe40275 | |
| parent | cb67286d6629ecb5bfc44071d664cf1cbd01a350 [diff] | |
| parent | 3b9447fb7fa1829731290e64ef928d4f6461310a [diff] |
Merge branch 'for-2.6.33' into for-2.6.34
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_route omap3pandora_out_map[] = { + {"PCM DAC", NULL, "APLL Enable"}, {"Headphone Amplifier", NULL, "PCM DAC"}, {"Line Out", NULL, "PCM DAC"}, {"Headphone Jack", NULL, "Headphone Amplifier"},