From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 16 Oct 2008 14:39:46 +0000 (+0200)
Subject: Merge branch 'topic/hda-reconfig' into topic/hda-next
X-Git-Tag: v2.6.29-rc1~590^2~5^2~3
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=dd125b28c1523a857b7657b5d8aa774ed1563687;p=linux-2.6-omap-h63xx.git

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

dd125b28c1523a857b7657b5d8aa774ed1563687
diff --cc sound/pci/hda/patch_sigmatel.c
index ec88ba88148,9c67af8e208..579b3281783
--- a/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;