diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-12-21 05:21:15 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-21 05:21:15 -0500 |
commit | de8853bc38ceab1fa7e7f723b21430d4aad60fea (patch) | |
tree | 5084ef51866fd1767324f8dc8eb36e97c55350f5 /sound/pci/hda/patch_realtek.c | |
parent | f5de24b06aa46427500d0fdbe8616b73a71d8c28 (diff) | |
parent | 440b004cf953bec2bc8cd91c64ae707fd7e25327 (diff) |
Merge remote branch 'alsa/fixes' into fix/hda
Diffstat (limited to 'sound/pci/hda/patch_realtek.c')
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index b3abe9ca826d..0877bae5dae1 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -6673,7 +6673,7 @@ static struct hda_input_mux alc889A_mb31_capture_source = { | |||
6673 | /* Front Mic (0x01) unused */ | 6673 | /* Front Mic (0x01) unused */ |
6674 | { "Line", 0x2 }, | 6674 | { "Line", 0x2 }, |
6675 | /* Line 2 (0x03) unused */ | 6675 | /* Line 2 (0x03) unused */ |
6676 | /* CD (0x04) unsused? */ | 6676 | /* CD (0x04) unused? */ |
6677 | }, | 6677 | }, |
6678 | }; | 6678 | }; |
6679 | 6679 | ||
@@ -9287,8 +9287,6 @@ static struct alc_config_preset alc882_presets[] = { | |||
9287 | .dac_nids = alc883_dac_nids, | 9287 | .dac_nids = alc883_dac_nids, |
9288 | .num_adc_nids = ARRAY_SIZE(alc889_adc_nids), | 9288 | .num_adc_nids = ARRAY_SIZE(alc889_adc_nids), |
9289 | .adc_nids = alc889_adc_nids, | 9289 | .adc_nids = alc889_adc_nids, |
9290 | .capsrc_nids = alc889_capsrc_nids, | ||
9291 | .capsrc_nids = alc889_capsrc_nids, | ||
9292 | .dig_out_nid = ALC883_DIGOUT_NID, | 9290 | .dig_out_nid = ALC883_DIGOUT_NID, |
9293 | .dig_in_nid = ALC883_DIGIN_NID, | 9291 | .dig_in_nid = ALC883_DIGIN_NID, |
9294 | .slave_dig_outs = alc883_slave_dig_outs, | 9292 | .slave_dig_outs = alc883_slave_dig_outs, |