summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/Kconfig
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-22 14:28:43 +0100
committerMark Brown <broonie@linaro.org>2013-08-22 14:28:43 +0100
commitc8a538417e2b6f0a68127cdcbbd0790b3bd250cf (patch)
treefb882334f89dfe2b7f2e05f3d6e2aab31433804d /sound/soc/codecs/Kconfig
parent97473630c78e687deb59284b19d09a095d38bc36 (diff)
parent6c3137fd01038972bf2ffe1e6fc4bb51b26e51f2 (diff)
downloadlinux-c8a538417e2b6f0a68127cdcbbd0790b3bd250cf.tar.bz2
Merge remote-tracking branch 'asoc/topic/new-pcm' into asoc-next
Diffstat (limited to 'sound/soc/codecs/Kconfig')
-rw-r--r--sound/soc/codecs/Kconfig8
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 69fb24053194..15106c045478 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -56,6 +56,8 @@ config SND_SOC_ALL_CODECS
select SND_SOC_MC13783 if MFD_MC13XXX
select SND_SOC_ML26124 if I2C
select SND_SOC_HDMI_CODEC
+ select SND_SOC_PCM1681 if I2C
+ select SND_SOC_PCM1792A if SPI_MASTER
select SND_SOC_PCM3008
select SND_SOC_RT5631 if I2C
select SND_SOC_RT5640 if I2C
@@ -300,6 +302,12 @@ config SND_SOC_MAX9850
config SND_SOC_HDMI_CODEC
tristate
+config SND_SOC_PCM1681
+ tristate
+
+config SND_SOC_PCM1792A
+ tristate
+
config SND_SOC_PCM3008
tristate