diff options
| author | Lee Jones <lee.jones@linaro.org> | 2012-01-12 12:50:11 +0000 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2012-01-12 12:50:11 +0000 |
| commit | 72108d578689febd3579bf16be470328ded6c6d9 (patch) | |
| tree | cc36ad5306ce823f8e98956c8f048f48017be3cc /sound/pci/hda/alc269_quirks.c | |
| parent | 330f78a83c1f47055427e10a68733af77b2cbac8 (diff) | |
| parent | 2150f72fe35397cc6d6ce39866bd0462cfbcc916 (diff) | |
Automatically merging tracking-igloo_kernel-other into merging-stable-linaro-ux500-3.1stable-linaro-ux500-3.1
Conflicting files:
Diffstat (limited to 'sound/pci/hda/alc269_quirks.c')
| -rw-r--r-- | sound/pci/hda/alc269_quirks.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/sound/pci/hda/alc269_quirks.c b/sound/pci/hda/alc269_quirks.c index 5ac0e2162a4..9aeeb326460 100644 --- a/sound/pci/hda/alc269_quirks.c +++ b/sound/pci/hda/alc269_quirks.c @@ -577,6 +577,9 @@ static const struct alc_config_preset alc269_presets[] = { alc269_laptop_amic_init_verbs }, .num_dacs = ARRAY_SIZE(alc269_dac_nids), .dac_nids = alc269_dac_nids, + .adc_nids = alc269_adc_nids, + .capsrc_nids = alc269_capsrc_nids, + .num_adc_nids = ARRAY_SIZE(alc269_adc_nids), .hp_nid = 0x03, .num_channel_mode = ARRAY_SIZE(alc269_modes), .channel_mode = alc269_modes, @@ -591,6 +594,9 @@ static const struct alc_config_preset alc269_presets[] = { alc269_laptop_dmic_init_verbs }, .num_dacs = ARRAY_SIZE(alc269_dac_nids), .dac_nids = alc269_dac_nids, + .adc_nids = alc269_adc_nids, + .capsrc_nids = alc269_capsrc_nids, + .num_adc_nids = ARRAY_SIZE(alc269_adc_nids), .hp_nid = 0x03, .num_channel_mode = ARRAY_SIZE(alc269_modes), .channel_mode = alc269_modes, @@ -605,6 +611,9 @@ static const struct alc_config_preset alc269_presets[] = { alc269vb_laptop_amic_init_verbs }, .num_dacs = ARRAY_SIZE(alc269_dac_nids), .dac_nids = alc269_dac_nids, + .adc_nids = alc269vb_adc_nids, + .capsrc_nids = alc269vb_capsrc_nids, + .num_adc_nids = ARRAY_SIZE(alc269vb_adc_nids), .hp_nid = 0x03, .num_channel_mode = ARRAY_SIZE(alc269_modes), .channel_mode = alc269_modes, @@ -619,6 +628,9 @@ static const struct alc_config_preset alc269_presets[] = { alc269vb_laptop_dmic_init_verbs }, .num_dacs = ARRAY_SIZE(alc269_dac_nids), .dac_nids = alc269_dac_nids, + .adc_nids = alc269vb_adc_nids, + .capsrc_nids = alc269vb_capsrc_nids, + .num_adc_nids = ARRAY_SIZE(alc269vb_adc_nids), .hp_nid = 0x03, .num_channel_mode = ARRAY_SIZE(alc269_modes), .channel_mode = alc269_modes, @@ -633,6 +645,8 @@ static const struct alc_config_preset alc269_presets[] = { alc269_laptop_dmic_init_verbs }, .num_dacs = ARRAY_SIZE(alc269_dac_nids), .dac_nids = alc269_dac_nids, + .adc_nids = alc269_adc_nids, + .capsrc_nids = alc269_capsrc_nids, .hp_nid = 0x03, .num_channel_mode = ARRAY_SIZE(alc269_modes), .channel_mode = alc269_modes, |