]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
ALSA: hda - Fix the merge error
authorTakashi Iwai <tiwai@suse.de>
Fri, 10 Jul 2009 10:33:48 +0000 (12:33 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 10 Jul 2009 10:33:48 +0000 (12:33 +0200)
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>
sound/pci/hda/patch_realtek.c

index 88a9da4afe5cf2a500cb2ce0bc931c07137cfe9b..7967f8f1a34733108c0e5c580bcc3f4d977f0193 100644 (file)
@@ -8587,7 +8587,7 @@ static struct alc_config_preset alc882_presets[] = {
        [ALC882_TARGA] = {
                .mixers = { alc882_targa_mixer, alc882_chmode_mixer },
                .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),
                .dac_nids = alc882_dac_nids,
                .dig_out_nid = ALC882_DIGOUT_NID,