Merge branch 'topic/hda-reconfig' into topic/hda-next

diff --cc sound/pci/hda/patch_realtek.c
Simple merge

diff --cc sound/pci/hda/patch_sigmatel.c
index ec88ba8814822ebd4825d75125260cd6bb2082e3,9c67af8e2089c7984f2d20d453c1c81bdedce7f3..579b328178364d28a791bb05d9a15a230619b3db
--- 1/sound/pci/hda/patch_sigmatel.c
--- 2/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@@ -217,13 -215,9 +216,12 @@@ struct sigmatel_spec 
  
        struct hda_pcm pcm_rec[2];      /* PCM information */
  
 +      /* jack detection */
 +      struct snd_jack *jack;
 +
        /* dynamic controls and input_mux */
        struct auto_pin_cfg autocfg;
-       unsigned int num_kctl_alloc, num_kctl_used;
-       struct snd_kcontrol_new *kctl_alloc;
+       struct snd_array kctls;
        struct hda_input_mux private_dimux;
        struct hda_input_mux private_imux;
        struct hda_input_mux private_smux;