Merge branch 'for-2.6.33' into for-2.6.34
This commit is contained in:
commit
4f2c120d18
1 changed files with 1 additions and 0 deletions
|
@ -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"},
|
||||||
|
|
Loading…
Add table
Reference in a new issue