aboutsummaryrefslogtreecommitdiff
path: root/sound/soc/codecs/Kconfig
diff options
context:
space:
mode:
authorMark Brown2012-12-10 00:22:15 +0900
committerMark Brown2012-12-10 00:22:15 +0900
commit473e8b323c97d1e63ca307b40468addbabfe511a (patch)
tree180b3441a9cf733ef9e20b0bab976eca90fefa78 /sound/soc/codecs/Kconfig
parent29998eb6180d7c7a45c48d629603b4ca2a7d19ec (diff)
parent83f7cbc43b623d8498b2b542f0dfb9d9f67db2fd (diff)
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