From: Mark Brown <broonie@kernel.org>
Date: Sun, 30 Apr 2017 13:16:04 +0000 (+0900)
Subject: Merge remote-tracking branches 'asoc/topic/max9878', 'asoc/topic/max98927', 'asoc... 
X-Git-Tag: v4.12-rc1~115^2^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ccf9fc86d63cbb5c46e96748f1937ce528f49ad2;p=people%2Farne_f%2Fkernel.git

Merge remote-tracking branches 'asoc/topic/max9878', 'asoc/topic/max98927', 'asoc/topic/mtk' and 'asoc/topic/nau8540' into asoc-next
---

ccf9fc86d63cbb5c46e96748f1937ce528f49ad2
diff --cc sound/soc/codecs/Kconfig
index 70decab5e9855,9e1718a8cb1ce,65e31ab88280e,e49e9da7f1f6e,e49e9da7f1f6e..1957521eabcd9
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@@@@ -538,15 -524,11 -525,11 -525,12 -525,12 +539,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