From: Mark Brown <broonie@kernel.org>
Date: Sun, 30 Apr 2017 13:15:55 +0000 (+0900)
Subject: Merge remote-tracking branches 'asoc/topic/es7134', 'asoc/topic/es8328', 'asoc/topic... 
X-Git-Tag: v4.12-rc1~115^2^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f57c12ab467494f66c9d616358703ae8a5098d6;p=thirdparty%2Flinux.git

Merge remote-tracking branches 'asoc/topic/es7134', 'asoc/topic/es8328', 'asoc/topic/fsl', 'asoc/topic/fsl-asrc' and 'asoc/topic/fsl-esai' into asoc-next
---

0f57c12ab467494f66c9d616358703ae8a5098d6
diff --cc sound/soc/codecs/Kconfig
index e3e6f39d14e86,7c7c2e96b8365,e49e9da7f1f6e,e49e9da7f1f6e,9e1718a8cb1ce,9e1718a8cb1ce..70decab5e9855
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@@@@@ -537,12 -526,15 -525,12 -525,12 -524,11 -524,11 +538,15 @@@@@@@ config SND_SOC_HDMI_CODE
      	select SND_PCM_IEC958
      	select HDMI
      
+ ++++config SND_SOC_ES7134
+ ++++       tristate "Everest Semi ES7134 CODEC"
+ ++++
      config SND_SOC_ES8328
    --	tristate "Everest Semi ES8328 CODEC"
    ++	tristate
      
      config SND_SOC_ES8328_I2C
    --	tristate
    ++	tristate "Everest Semi ES8328 CODEC (I2C)"
    ++	depends on I2C
      	select SND_SOC_ES8328
      
      config SND_SOC_ES8328_SPI