linux/sound/soc
Arnd Bergmann f9a7ba3269 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: 19926c6de0 ("ASoC: davinci: vcif must be a module if SND_DAVINCI_SOC is")
Signed-off-by: Mark Brown <broonie@kernel.org>
2015-01-29 11:51:29 +00:00
..
adi ASoC: adi: drop owner assignment from platform_drivers 2014-10-20 16:22:03 +02:00
atmel sound fixes for 3.19-rc1 2014-12-19 18:07:17 -08:00
au1x Driver core patches for 3.19-rc1 2014-12-14 16:10:09 -08:00
bcm ASoC: bcm: drop owner assignment from platform_drivers 2014-10-20 16:22:04 +02:00
blackfin Driver core patches for 3.19-rc1 2014-12-14 16:10:09 -08:00
cirrus Driver core patches for 3.19-rc1 2014-12-14 16:10:09 -08:00
codecs sound fixes for 3.19-rc1 2014-12-19 18:07:17 -08:00
davinci ASoC: davinci: fix DM365_EVM codec selection 2015-01-29 11:51:29 +00:00
dwc Driver core patches for 3.19-rc1 2014-12-14 16:10:09 -08:00
fsl More ACPI and power management updates for 3.19-rc1 2014-12-18 20:28:33 -08:00
generic Driver core patches for 3.19-rc1 2014-12-14 16:10:09 -08:00
intel CONFIG_PM_RUNTIME elimination for 3.19-rc1 2014-12-20 13:37:44 -08:00
jz4740 Driver core patches for 3.19-rc1 2014-12-14 16:10:09 -08:00
kirkwood ASoC: kirkwood: drop owner assignment from platform_drivers 2014-10-20 16:22:10 +02:00
mxs Driver core patches for 3.19-rc1 2014-12-14 16:10:09 -08:00
nuc900 Driver core patches for 3.19-rc1 2014-12-14 16:10:09 -08:00
omap Driver core patches for 3.19-rc1 2014-12-14 16:10:09 -08:00
pxa Driver core patches for 3.19-rc1 2014-12-14 16:10:09 -08:00
rockchip Driver core patches for 3.19-rc1 2014-12-14 16:10:09 -08:00
samsung sound fixes for 3.19-rc1 2014-12-19 18:07:17 -08:00
sh Driver core patches for 3.19-rc1 2014-12-14 16:10:09 -08:00
sirf ASoC: sirf: drop owner assignment from platform_drivers 2014-10-20 16:22:14 +02:00
spear ASoC: spear: drop owner assignment from platform_drivers 2014-10-20 16:22:14 +02:00
tegra Driver core patches for 3.19-rc1 2014-12-14 16:10:09 -08:00
txx9 Driver core patches for 3.19-rc1 2014-12-14 16:10:09 -08:00
ux500 Driver core patches for 3.19-rc1 2014-12-14 16:10:09 -08:00
Kconfig ASoC: s6000: remove driver 2014-10-20 11:03:52 +01:00
Makefile Merge remote-tracking branches 'asoc/topic/ac97', 'asoc/topic/ad193x', 'asoc/topic/adau1373' and 'asoc/topic/adau17x1' into asoc-next 2014-12-08 13:11:45 +00:00
soc-ac97.c ASoC: ac97: Push snd_ac97 pointer to the driver level 2014-11-18 15:38:03 +00:00
soc-cache.c ASoC: Remove snd_soc_cache_sync() implementation 2014-11-09 09:06:30 +00:00
soc-compress.c ASoC: soc-compress: consolidate two identical branches 2014-10-22 11:36:36 +01:00
soc-core.c Driver core patches for 3.19-rc1 2014-12-14 16:10:09 -08:00
soc-dapm.c ASoC: Remove card field from snd_soc_dai struct 2014-11-04 11:53:53 +00:00
soc-devres.c ASoC: Export devm_snd_soc_register_platform() 2014-04-22 22:00:42 +01:00
soc-generic-dmaengine-pcm.c ASoC: Consolidate platform and CODEC probe/remove 2014-08-19 10:59:45 -05:00
soc-io.c ASoC: Automatically initialize regmap for all components 2014-08-19 10:59:47 -05:00
soc-jack.c Merge remote-tracking branches 'asoc/topic/hdmi', 'asoc/topic/intel', 'asoc/topic/jack', 'asoc/topic/jz4740' and 'asoc/topic/lm49453' into asoc-next 2014-12-08 13:12:00 +00:00
soc-ops.c ASoC: core: Split ops out of soc-core.c 2014-10-29 11:15:10 +00:00
soc-pcm.c Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/doc', 'asoc/topic/dpcm', 'asoc/topic/dwc' and 'asoc/topic/fsi' into asoc-next 2014-12-08 13:11:56 +00:00
soc-utils.c ASoC: : drop owner assignment from platform_drivers 2014-10-20 16:22:02 +02:00