diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-01-28 22:30:01 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-06 14:57:18 -0800 |
| commit | 38e17b6477cf737704716ee567406a6e90be17aa (patch) | |
| tree | 3655c16ed4647debdc391484119c3b54528688a4 /drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.c | |
| parent | 6393f60525cc47c7456b78ea5e2bc03e7d6c69f9 (diff) | |
ASoC: davinci: fix DM365_EVM codec selection
commit f9a7ba326938f03b9305af8d31c360fce10cd4df upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.c')
0 files changed, 0 insertions, 0 deletions