Merge branch 'topic/multi-component' of git://git.kernel.org/pub/scm/linux/kernel...

diff --cc sound/soc/codecs/wm8580.c
Simple merge

diff --cc sound/soc/s3c24xx/smdk64xx_wm8580.c
index 4926acaaa8b0760df08aacf57fa87d204248e1f8,634acfc41608318b21f1fdb8b6340de08a02e3d9..5c21e26da07563d2267f9bfe572da0320faa874a
--- 1/sound/soc/s3c24xx/smdk64xx_wm8580.c
--- 2/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));