summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/Kconfig
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-02 13:35:10 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-02 13:35:10 +0900
commitd0f3ea4252a2b5b66b013ee161257782a37c535f (patch)
treed9337fece53c1778d72fde7cd2fc6661c20d2199 /sound/soc/codecs/Kconfig
parent605886854398d90ee3ba00bb504f2284fb97a5f9 (diff)
parent83f7cbc43b623d8498b2b542f0dfb9d9f67db2fd (diff)
downloadlinux-d0f3ea4252a2b5b66b013ee161257782a37c535f.tar.bz2
Merge remote-tracking branch 'asoc/topic/max98090' into asoc-next
Diffstat (limited to 'sound/soc/codecs/Kconfig')
-rw-r--r--sound/soc/codecs/Kconfig4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index ef03c7ab46a6..7f15a82d1b21 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -44,6 +44,7 @@ config SND_SOC_ALL_CODECS
select SND_SOC_LM4857 if I2C
select SND_SOC_LM49453 if I2C
select SND_SOC_MAX98088 if I2C
+ select SND_SOC_MAX98090 if I2C
select SND_SOC_MAX98095 if I2C
select SND_SOC_MAX9850 if I2C
select SND_SOC_MAX9768 if I2C
@@ -266,6 +267,9 @@ config SND_SOC_LM49453
config SND_SOC_MAX98088
tristate
+config SND_SOC_MAX98090
+ tristate
+
config SND_SOC_MAX98095
tristate