]> git.baikalelectronics.ru Git - kernel.git/commit
ASoC: davinci: fix DM365_EVM codec selection
authorArnd Bergmann <arnd@arndb.de>
Wed, 28 Jan 2015 21:30:01 +0000 (22:30 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 29 Jan 2015 11:51:29 +0000 (11:51 +0000)
commit6d248d558cab0fda901ba5f2a9b810cbd6d16ea0
treec9a97f0b3de73c270b42ba7abac188580b40a58e
parentbae2aa5f08e2478f0ecc6db0433ab48b14b98397
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: 1d3e2f2a1e59 ("ASoC: davinci: vcif must be a module if SND_DAVINCI_SOC is")
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/davinci/Kconfig