Merge branch 'fix/asoc' into for-linus

This commit is contained in:
Takashi Iwai
2010-02-05 19:57:16 +01:00

View File

@@ -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[] = { static const struct snd_soc_dapm_route omap3pandora_out_map[] = {
{"PCM DAC", NULL, "APLL Enable"},
{"Headphone Amplifier", NULL, "PCM DAC"}, {"Headphone Amplifier", NULL, "PCM DAC"},
{"Line Out", NULL, "PCM DAC"}, {"Line Out", NULL, "PCM DAC"},
{"Headphone Jack", NULL, "Headphone Amplifier"}, {"Headphone Jack", NULL, "Headphone Amplifier"},