diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-09-29 11:32:17 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-29 12:12:05 -0400 |
| commit | 19926c6de0c37f486f00b7531aec4ba5a09451ae (patch) | |
| tree | 5b3e7e0abf1ec0c671bf4346694f6f16277d55f4 /sound/soc/davinci | |
| parent | 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 (diff) | |
ASoC: davinci: vcif must be a module if SND_DAVINCI_SOC is
It is possible to configure a kernel with SND_DAVINCI_SOC=m and
SND_DM365_VOICE_CODEC=y, which results in a link error:
sound/built-in.o: In function `davinci_vcif_probe':
sound/soc/davinci/davinci-vcif.c:223: undefined reference to `davinci_soc_platform_register'
The best way to avoid this is to make SND_DM365_VOICE_CODEC
a tristate option that depends on SND_DAVINCI_SOC, so it
can only be a module or disabled when the base driver is
a loadable module
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/davinci')
| -rw-r--r-- | sound/soc/davinci/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/davinci/Kconfig b/sound/soc/davinci/Kconfig index d69510c53239..8e948c63f3d9 100644 --- a/sound/soc/davinci/Kconfig +++ b/sound/soc/davinci/Kconfig | |||
| @@ -63,7 +63,8 @@ config SND_DM365_AIC3X_CODEC | |||
| 63 | Say Y if you want to add support for AIC3101 audio codec | 63 | Say Y if you want to add support for AIC3101 audio codec |
| 64 | 64 | ||
| 65 | config SND_DM365_VOICE_CODEC | 65 | config SND_DM365_VOICE_CODEC |
| 66 | bool "Voice Codec - CQ93VC" | 66 | tristate "Voice Codec - CQ93VC" |
| 67 | depends on SND_DAVINCI_SOC | ||
| 67 | select MFD_DAVINCI_VOICECODEC | 68 | select MFD_DAVINCI_VOICECODEC |
| 68 | select SND_DAVINCI_SOC_VCIF | 69 | select SND_DAVINCI_SOC_VCIF |
| 69 | select SND_SOC_CQ0093VC | 70 | select SND_SOC_CQ0093VC |