diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-05-08 16:38:02 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-05-08 16:38:02 +0200 |
commit | ffd344444f9f8f4843d24084ef3da0d09140edb8 (patch) | |
tree | a4e8f1144e0023bad4009c26c094747063611857 /sound/soc/soc-dapm.c | |
parent | 6942c103fb4b0ce91be910a716044ac181a9c2dd (diff) | |
parent | 619a341b78f17fb86d92e89c04612676cd05e26f (diff) |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'sound/soc/soc-dapm.c')
-rw-r--r-- | sound/soc/soc-dapm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 6241490fff30..dc7dbfe61cd0 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -67,6 +67,7 @@ static int dapm_up_seq[] = { [snd_soc_dapm_out_drv] = 10, [snd_soc_dapm_hp] = 10, [snd_soc_dapm_spk] = 10, + [snd_soc_dapm_line] = 10, [snd_soc_dapm_post] = 11, }; @@ -75,6 +76,7 @@ static int dapm_down_seq[] = { [snd_soc_dapm_adc] = 1, [snd_soc_dapm_hp] = 2, [snd_soc_dapm_spk] = 2, + [snd_soc_dapm_line] = 2, [snd_soc_dapm_out_drv] = 2, [snd_soc_dapm_pga] = 4, [snd_soc_dapm_mixer_named_ctl] = 5, |