aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_realtek.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-07-10 06:33:48 -0400
committerTakashi Iwai <tiwai@suse.de>2009-07-10 06:33:48 -0400
commit31909b83ea5b4035ce129bb0df622ec2d2fb3e96 (patch)
tree74d6bf2cc7a95dfb70d407dda6a84952d3e9b160 /sound/pci/hda/patch_realtek.c
parent305355aad89f1b7eb27cb210fad2f9d3c67b2572 (diff)
ALSA: hda - Fix the merge error
Fix the merge error at the commit 305355aad89f1b7eb27cb210fad2f9d3c67b2572, an addition of the missing alc880_gpio3_init_verbs to ALC882_TARGA model. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_realtek.c')
-rw-r--r--sound/pci/hda/patch_realtek.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 88a9da4afe5..7967f8f1a34 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -8587,7 +8587,7 @@ static struct alc_config_preset alc882_presets[] = {
8587 [ALC882_TARGA] = { 8587 [ALC882_TARGA] = {
8588 .mixers = { alc882_targa_mixer, alc882_chmode_mixer }, 8588 .mixers = { alc882_targa_mixer, alc882_chmode_mixer },
8589 .init_verbs = { alc882_base_init_verbs, alc882_adc1_init_verbs, 8589 .init_verbs = { alc882_base_init_verbs, alc882_adc1_init_verbs,
8590 alc882_targa_verbs}, 8590 alc880_gpio3_init_verbs, alc882_targa_verbs},
8591 .num_dacs = ARRAY_SIZE(alc882_dac_nids), 8591 .num_dacs = ARRAY_SIZE(alc882_dac_nids),
8592 .dac_nids = alc882_dac_nids, 8592 .dac_nids = alc882_dac_nids,
8593 .dig_out_nid = ALC882_DIGOUT_NID, 8593 .dig_out_nid = ALC882_DIGOUT_NID,