Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-18 10:01:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: hda - Fix the merge error

Browse Source 
Fix the merge error at the commit 305355aad8,
an addition of the missing alc880_gpio3_init_verbs to ALC882_TARGA model.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2009-07-10 12:33:48 +02:00
parent 305355aad8
commit 31909b83ea
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/pci/hda/patch_realtek.c
View File

@ -8587,7 +8587,7 @@ static struct alc_config_preset alc882_presets[] = {
[ALC882_TARGA] = { [ALC882_TARGA] = {
.mixers = { alc882_targa_mixer, alc882_chmode_mixer }, .mixers = { alc882_targa_mixer, alc882_chmode_mixer },
.init_verbs = { alc882_base_init_verbs, alc882_adc1_init_verbs, .init_verbs = { alc882_base_init_verbs, alc882_adc1_init_verbs,
alc882_targa_verbs}, alc880_gpio3_init_verbs, alc882_targa_verbs},
.num_dacs = ARRAY_SIZE(alc882_dac_nids), .num_dacs = ARRAY_SIZE(alc882_dac_nids),
.dac_nids = alc882_dac_nids, .dac_nids = alc882_dac_nids,
.dig_out_nid = ALC882_DIGOUT_NID, .dig_out_nid = ALC882_DIGOUT_NID,