diff options
author | Mark Brown <broonie@linaro.org> | 2013-08-22 09:28:43 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-08-22 09:28:43 -0400 |
commit | c8a538417e2b6f0a68127cdcbbd0790b3bd250cf (patch) | |
tree | fb882334f89dfe2b7f2e05f3d6e2aab31433804d /sound/soc/codecs/Kconfig | |
parent | 97473630c78e687deb59284b19d09a095d38bc36 (diff) | |
parent | 6c3137fd01038972bf2ffe1e6fc4bb51b26e51f2 (diff) |
Merge remote-tracking branch 'asoc/topic/new-pcm' into asoc-next
Diffstat (limited to 'sound/soc/codecs/Kconfig')
-rw-r--r-- | sound/soc/codecs/Kconfig | 8 |
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 | |||
56 | select SND_SOC_MC13783 if MFD_MC13XXX | 56 | select SND_SOC_MC13783 if MFD_MC13XXX |
57 | select SND_SOC_ML26124 if I2C | 57 | select SND_SOC_ML26124 if I2C |
58 | select SND_SOC_HDMI_CODEC | 58 | select SND_SOC_HDMI_CODEC |
59 | select SND_SOC_PCM1681 if I2C | ||
60 | select SND_SOC_PCM1792A if SPI_MASTER | ||
59 | select SND_SOC_PCM3008 | 61 | select SND_SOC_PCM3008 |
60 | select SND_SOC_RT5631 if I2C | 62 | select SND_SOC_RT5631 if I2C |
61 | select SND_SOC_RT5640 if I2C | 63 | select SND_SOC_RT5640 if I2C |
@@ -300,6 +302,12 @@ config SND_SOC_MAX9850 | |||
300 | config SND_SOC_HDMI_CODEC | 302 | config SND_SOC_HDMI_CODEC |
301 | tristate | 303 | tristate |
302 | 304 | ||
305 | config SND_SOC_PCM1681 | ||
306 | tristate | ||
307 | |||
308 | config SND_SOC_PCM1792A | ||
309 | tristate | ||
310 | |||
303 | config SND_SOC_PCM3008 | 311 | config SND_SOC_PCM3008 |
304 | tristate | 312 | tristate |
305 | 313 | ||