Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f2c120d authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.33' into for-2.6.34

parents cb67286d 3b9447fb

sound/soc/omap/omap3pandora.c

+1 −0
Original line number Diff line number Diff line
@@ -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"},