From: Mark Brown <broonie@linaro.org>
Date: Mon, 4 Aug 2014 15:32:01 +0000 (+0100)
Subject: Merge remote-tracking branches 'asoc/topic/rt5670', 'asoc/topic/rt5677', 'asoc/topic... 
X-Git-Tag: v3.17-rc1~101^2~5^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1bd940afdba6d8d6a0a2219cf6ae9dafc7ef0a9;p=thirdparty%2Fkernel%2Flinux.git

Merge remote-tracking branches 'asoc/topic/rt5670', 'asoc/topic/rt5677', 'asoc/topic/s6000', 'asoc/topic/samsung' and 'asoc/topic/sh-fsi' into asoc-next
---

c1bd940afdba6d8d6a0a2219cf6ae9dafc7ef0a9
diff --cc sound/soc/codecs/Kconfig
index 4c7542571484e,f31b132e75c58,9d88845dc7c4f,cbfa1e18f6519,cbfa1e18f6519,cbfa1e18f6519..a445b448d41d6
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@@@@@ -452,13 -446,14 -445,12 -445,10 -445,10 -445,10 +453,17 @@@@@@@ config SND_SOC_RL623
      	default y if SND_SOC_RT5640=y
      	default y if SND_SOC_RT5645=y
      	default y if SND_SOC_RT5651=y
+ ++++	default y if SND_SOC_RT5670=y
+  +++	default y if SND_SOC_RT5677=y
      	default m if SND_SOC_RT5640=m
      	default m if SND_SOC_RT5645=m
      	default m if SND_SOC_RT5651=m
+ ++++	default m if SND_SOC_RT5670=m
+  +++	default m if SND_SOC_RT5677=m
   +++
 +++++config SND_SOC_RT286
 +++++	tristate
 ++   
      config SND_SOC_RT5631
      	tristate