diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-02-05 07:43:50 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-02-05 07:43:50 -0500 |
| commit | 4f2c120d1860ce33a71c617f59cf80c700b30d2a (patch) | |
| tree | 471cacce67e584cff5ac97913f546f234fe40275 /sound/soc | |
| parent | cb67286d6629ecb5bfc44071d664cf1cbd01a350 (diff) | |
| parent | 3b9447fb7fa1829731290e64ef928d4f6461310a (diff) | |
Merge branch 'for-2.6.33' into for-2.6.34
Diffstat (limited to 'sound/soc')
| -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[] = { | |||
| 145 | }; | 145 | }; |
| 146 | 146 | ||
| 147 | static const struct snd_soc_dapm_route omap3pandora_out_map[] = { | 147 | static const struct snd_soc_dapm_route omap3pandora_out_map[] = { |
| 148 | {"PCM DAC", NULL, "APLL Enable"}, | ||
| 148 | {"Headphone Amplifier", NULL, "PCM DAC"}, | 149 | {"Headphone Amplifier", NULL, "PCM DAC"}, |
| 149 | {"Line Out", NULL, "PCM DAC"}, | 150 | {"Line Out", NULL, "PCM DAC"}, |
| 150 | {"Headphone Jack", NULL, "Headphone Amplifier"}, | 151 | {"Headphone Jack", NULL, "Headphone Amplifier"}, |