Merge branch 'fix/hda' into topic/hda

Conflicts:
	sound/pci/hda/patch_realtek.c

diff --cc sound/pci/hda/patch_realtek.c
index 2ae6bfb,22c73b7..65955da
--- 1/sound/pci/hda/patch_realtek.c
--- 2/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)
  {