Merge remote-tracking branches 'asoc/topic/es7134', 'asoc/topic/es8328', 'asoc/topic...

diff --cc sound/soc/codecs/Kconfig
index e3e6f39d14e86f08828c4ad6c4edbd25535447ea,7c7c2e96b83659b9d22f571c25c1dc11ad41a446,e49e9da7f1f6e41028a0ca832e76e7dce0bc1c01,e49e9da7f1f6e41028a0ca832e76e7dce0bc1c01,9e1718a8cb1ce20a0fd68e2cbe797653b39aadeb,9e1718a8cb1ce20a0fd68e2cbe797653b39aadeb..70decab5e9855e91b85b65ee7559a53f55d01a84
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
--- 3/sound/soc/codecs/Kconfig
--- 4/sound/soc/codecs/Kconfig
--- 5/sound/soc/codecs/Kconfig
--- 6/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

diff --cc sound/soc/codecs/Makefile
Simple merge