summaryrefslogtreecommitdiff
path: root/sound/soc/davinci/Kconfig
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-01-29 00:30:01 +0300
committerMark Brown <broonie@kernel.org>2015-01-29 14:51:29 +0300
commitf9a7ba326938f03b9305af8d31c360fce10cd4df (patch)
treec9a97f0b3de73c270b42ba7abac188580b40a58e /sound/soc/davinci/Kconfig
parent5a1b8a80daa15e5b1920735133b80dd46975765f (diff)
downloadlinux-f9a7ba326938f03b9305af8d31c360fce10cd4df.tar.xz
ASoC: davinci: fix DM365_EVM codec selection
An earlier bug fix of mine made the SND_DM365_VOICE_CODEC symbol tristate to avoid creating an undefined reference from the davinci-vcif.c driver to the davinci_soc_platform_register function that may be in a module. However, this may now lead to a different error on randconfig kernels: "warning: SND_DM365_VOICE_CODEC creates inconsistent choice state" This happens because we now have a choice statement with one bool and one tristate option, and the latter might not support being set to 'y' because of dependencies. This new change turns the other option into 'tristate' as well, which avoids the problem. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Fixes: 19926c6de0c3 ("ASoC: davinci: vcif must be a module if SND_DAVINCI_SOC is") Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/davinci/Kconfig')
-rw-r--r--sound/soc/davinci/Kconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/davinci/Kconfig b/sound/soc/davinci/Kconfig
index 8e948c63f3d9..2b81ca418d2a 100644
--- a/sound/soc/davinci/Kconfig
+++ b/sound/soc/davinci/Kconfig
@@ -58,13 +58,12 @@ choice
depends on MACH_DAVINCI_DM365_EVM
config SND_DM365_AIC3X_CODEC
- bool "Audio Codec - AIC3101"
+ tristate "Audio Codec - AIC3101"
help
Say Y if you want to add support for AIC3101 audio codec
config SND_DM365_VOICE_CODEC
tristate "Voice Codec - CQ93VC"
- depends on SND_DAVINCI_SOC
select MFD_DAVINCI_VOICECODEC
select SND_DAVINCI_SOC_VCIF
select SND_SOC_CQ0093VC