Merge remote-tracking branch 'asoc/topic/ssm2518' into asoc-next

1 files changed, 4 insertions, 0 deletions

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 0615e00b4ab7..badb6fbacaa6 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -61,6 +61,7 @@ config SND_SOC_ALL_CODECS
         select SND_SOC_SI476X if MFD_SI476X_CORE
         select SND_SOC_SN95031 if INTEL_SCU_IPC
         select SND_SOC_SPDIF
+        select SND_SOC_SSM2518 if I2C
         select SND_SOC_SSM2602 if SND_SOC_I2C_AND_SPI
         select SND_SOC_STA32X if I2C
         select SND_SOC_STA529 if I2C
@@ -317,6 +318,9 @@ config SND_SOC_SN95031
 config SND_SOC_SPDIF
         tristate
 
+config SND_SOC_SSM2518
+        tristate
+
 config SND_SOC_SSM2602
         tristate