From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 30 Nov 2010 11:35:43 +0000 (+0000)
Subject: Merge branch 'for-2.6.37' into for-2.6.38
X-Git-Tag: v5.15~23284^2~1117^2~218
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=dfa7c70b04bb20df7936018c737014655bf92d09;p=mirror_ubuntu-kernels.git

Merge branch 'for-2.6.37' into for-2.6.38
---

dfa7c70b04bb20df7936018c737014655bf92d09
diff --cc sound/soc/s6000/s6105-ipcam.c
index 2e977e4d65e7,c1244c5bc730..bf3f3f9165e4
--- a/sound/soc/s6000/s6105-ipcam.c
+++ b/sound/soc/s6000/s6105-ipcam.c
@@@ -144,31 -143,31 +144,31 @@@ static int s6105_aic3x_init(struct snd_
  				  ARRAY_SIZE(aic3x_dapm_widgets));
  
  	/* Set up s6105 specific audio path audio_map */
 -	snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
 +	snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
  
  	/* not present */
 -	snd_soc_dapm_nc_pin(codec, "MONO_LOUT");
 -	snd_soc_dapm_nc_pin(codec, "LINE2L");
 -	snd_soc_dapm_nc_pin(codec, "LINE2R");
 +	snd_soc_dapm_nc_pin(dapm, "MONO_LOUT");
 +	snd_soc_dapm_nc_pin(dapm, "LINE2L");
 +	snd_soc_dapm_nc_pin(dapm, "LINE2R");
  
  	/* not connected */
 -	snd_soc_dapm_nc_pin(codec, "MIC3L"); /* LINE2L on this chip */
 -	snd_soc_dapm_nc_pin(codec, "MIC3R"); /* LINE2R on this chip */
 -	snd_soc_dapm_nc_pin(codec, "LLOUT");
 -	snd_soc_dapm_nc_pin(codec, "RLOUT");
 -	snd_soc_dapm_nc_pin(codec, "HPRCOM");
 +	snd_soc_dapm_nc_pin(dapm, "MIC3L"); /* LINE2L on this chip */
 +	snd_soc_dapm_nc_pin(dapm, "MIC3R"); /* LINE2R on this chip */
 +	snd_soc_dapm_nc_pin(dapm, "LLOUT");
 +	snd_soc_dapm_nc_pin(dapm, "RLOUT");
 +	snd_soc_dapm_nc_pin(dapm, "HPRCOM");
  
  	/* always connected */
 -	snd_soc_dapm_enable_pin(codec, "Audio In");
 +	snd_soc_dapm_enable_pin(dapm, "Audio In");
  
  	/* must correspond to audio_out_mux.private_value initializer */
 -	snd_soc_dapm_disable_pin(codec, "Audio Out Differential");
 -	snd_soc_dapm_sync(codec);
 -	snd_soc_dapm_enable_pin(codec, "Audio Out Stereo");
 +	snd_soc_dapm_disable_pin(dapm, "Audio Out Differential");
 +	snd_soc_dapm_sync(dapm);
 +	snd_soc_dapm_enable_pin(dapm, "Audio Out Stereo");
  
 -	snd_soc_dapm_sync(codec);
 +	snd_soc_dapm_sync(dapm);
  
- 	snd_ctl_add(codec->snd_card, snd_ctl_new1(&audio_out_mux, codec));
+ 	snd_ctl_add(codec->card->snd_card, snd_ctl_new1(&audio_out_mux, codec));
  
  	return 0;
  }