diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-02-05 19:57:16 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-02-05 19:57:16 +0100 |
| commit | a26a408888b2968d5de5af233655f6497ac5623f (patch) | |
| tree | 9bc95b07389e07c8364ca79f99e11aeb5a790242 /sound | |
| parent | db9256c00329035463625cbe709d2d24e97abad4 (diff) | |
| parent | 3b9447fb7fa1829731290e64ef928d4f6461310a (diff) | |
| download | linux-3.10-a26a408888b2968d5de5af233655f6497ac5623f.tar.gz linux-3.10-a26a408888b2968d5de5af233655f6497ac5623f.tar.bz2 linux-3.10-a26a408888b2968d5de5af233655f6497ac5623f.zip | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/omap/omap3pandora.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c index 71b2c161158..68980c19a3b 100644 --- a/sound/soc/omap/omap3pandora.c +++ b/sound/soc/omap/omap3pandora.c @@ -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"}, |