Skip to content

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

Merge branch 'for-2.6.33' into for-2.6.34

parents cb67286d 3b9447fb
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
sound/soc/omap/omap3pandora.c
View file @ 4f2c120d
...@@ -145,6 +145,7 @@ static const struct snd_soc_dapm_widget omap3pandora_in_dapm_widgets[] = { ...@@ -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"},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7