diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-17 20:20:29 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-17 20:20:29 +0400 |
| commit | bfe617d33db9871b1ac25b62e9086336cd633db2 (patch) | |
| tree | 1f7e192567d929d0197bbc9792fd0fee588f7d3c /sound/soc/codecs/Kconfig | |
| parent | 5f5eb4efe575734e54f26c34ffffc4b48cdca3aa (diff) | |
| parent | 1aad4e574bced05b4036e79981a7800dd275cf1c (diff) | |
| download | linux-bfe617d33db9871b1ac25b62e9086336cd633db2.tar.xz | |
Merge remote-tracking branch 'asoc/topic/ssm2518' into asoc-next
Diffstat (limited to 'sound/soc/codecs/Kconfig')
| -rw-r--r-- | sound/soc/codecs/Kconfig | 4 |
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 |