From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 12 Aug 2010 13:40:28 +0000 (+0100)
Subject: Merge branch 'topic/multi-component' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.37-rc1~82^2~8^2~176
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cf7af01aa77ec1b17687f5328ce0a598709efd59;p=platform%2Fkernel%2Flinux-stable.git

Merge branch 'topic/multi-component' of git://git./linux/kernel/git/lrg/asoc-2.6 into for-2.6.37
---

cf7af01aa77ec1b17687f5328ce0a598709efd59
diff --cc sound/soc/s3c24xx/smdk64xx_wm8580.c
index 4926aca,634acfc..5c21e26
--- a/sound/soc/s3c24xx/smdk64xx_wm8580.c
+++ b/sound/soc/s3c24xx/smdk64xx_wm8580.c
@@@ -168,20 -162,22 +168,22 @@@ static const struct snd_soc_dapm_route 
  /* SMDK-PAIFRX connections */
  static const struct snd_soc_dapm_route audio_map_rx[] = {
  	/* Front Left/Right are fed VOUT1L/R */
 -	{"Front-L/R", NULL, "VOUT1L"},
 -	{"Front-L/R", NULL, "VOUT1R"},
 +	{"Front", NULL, "VOUT1L"},
 +	{"Front", NULL, "VOUT1R"},
  
  	/* Center/Sub are fed VOUT2L/R */
 -	{"Center/Sub", NULL, "VOUT2L"},
 -	{"Center/Sub", NULL, "VOUT2R"},
 +	{"Center+Sub", NULL, "VOUT2L"},
 +	{"Center+Sub", NULL, "VOUT2R"},
  
  	/* Rear Left/Right are fed VOUT3L/R */
 -	{"Rear-L/R", NULL, "VOUT3L"},
 -	{"Rear-L/R", NULL, "VOUT3R"},
 +	{"Rear", NULL, "VOUT3L"},
 +	{"Rear", NULL, "VOUT3R"},
  };
  
- static int smdk64xx_wm8580_init_paiftx(struct snd_soc_codec *codec)
+ static int smdk64xx_wm8580_init_paiftx(struct snd_soc_pcm_runtime *rtd)
  {
+ 	struct snd_soc_codec *codec = rtd->codec;
+ 
  	/* Add smdk64xx specific Capture widgets */
  	snd_soc_dapm_new_controls(codec, wm8580_dapm_widgets_cpt,
  				  ARRAY_SIZE(wm8580_dapm_widgets_cpt));