]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit4c2ff3ab36ea3a57000a83a731ebcf571a8a65de
tree74d6bf2cc7a95dfb70d407dda6a84952d3e9b160
parent0ecd1b61acad829fe55741976862d5f1723e3e7a
ALSA: hda - Fix the merge error

Fix the merge error at the commit 0ecd1b61acad829fe55741976862d5f1723e3e7a,
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