Commit a26a4088 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/asoc' into for-linus

parents db9256c0 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"},