From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 7 Mar 2012 08:05:15 +0000 (+0100)
Subject: Merge branch 'fix/hda' into topic/hda
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=fc7a1627c11bb6e4eb71fd8f792109754175f7bc;p=~shefty%2Frdma-dev.git

Merge branch 'fix/hda' into topic/hda

Conflicts:
	sound/pci/hda/patch_realtek.c
---

fc7a1627c11bb6e4eb71fd8f792109754175f7bc
diff --cc sound/pci/hda/patch_realtek.c
index 2ae6bfbc678,22c73b78ac6..65955dabc15
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@@ -2051,7 -2068,7 +2051,8 @@@ static int alc_build_controls(struct hd
   */
  
  static void alc_init_special_input_src(struct hda_codec *codec);
 +static void alc_auto_init_std(struct hda_codec *codec);
+ static int alc269_fill_coef(struct hda_codec *codec);
  
  static int alc_init(struct hda_codec *codec)
  {