Merge branch 'for-2.6.33' into for-2.6.34

4f2c120d · Mark Brown · cb67286d · 3b9447fb · 4f2c120d
隐藏空白更改
内联并排

Showing with 1 addition and 0 deletion

sound/soc/omap/omap3pandora.c sound/soc/omap/omap3pandora.c +1 -0

未找到文件。
--- 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"},