diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-02-05 13:43:50 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-02-05 13:43:50 +0100 |
| commit | 4f2c120d1860ce33a71c617f59cf80c700b30d2a (patch) | |
| tree | 471cacce67e584cff5ac97913f546f234fe40275 /sound | |
| parent | ASoC: TWL4030: Module unloading fix (diff) | |
| parent | ASoC: pandora: Add APLL supply to fix audio output (diff) | |
| download | linux-4f2c120d1860ce33a71c617f59cf80c700b30d2a.tar.xz linux-4f2c120d1860ce33a71c617f59cf80c700b30d2a.zip | |
Merge branch 'for-2.6.33' into for-2.6.34
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/omap/omap3pandora.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c index 71b2c161158d..68980c19a3bc 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"}, |