diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-11-24 23:21:10 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-11-25 11:56:10 +0000 |
| commit | ab07eaedb7ada83cc6341894dff9cd54f1af7f8b (patch) | |
| tree | eed3294ea693b8afb52c770cb4c0ae4094224660 | |
| parent | 8005c49d9aea74d382f474ce11afbbc7d7130bec (diff) | |
| download | blackbird-op-linux-ab07eaedb7ada83cc6341894dff9cd54f1af7f8b.tar.gz blackbird-op-linux-ab07eaedb7ada83cc6341894dff9cd54f1af7f8b.zip | |
ASoC: fsl: clarify ac97 dependency
A new randconfig build failure shows that the fsl-asoc-card module
must not be built-in when the AC97 driver is a loadable module:
sound/built-in.o: In function `fsl_asoc_card_late_probe':
:(.text+0x571d8): undefined reference to `snd_ac97_update_bits'
I couldn't come up with a nice solution, so this adds another dependency
on "X || !X", which is the Kconfig way of saying that we have an
optional dependency on something that might be a loadable module.
Fixes: 50760cad9de9 ("ASoC: fsl-asoc-card: add AC'97 support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/fsl/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 19c302b0d763..14dfdee05fd5 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -283,6 +283,8 @@ config SND_SOC_IMX_MC13783 config SND_SOC_FSL_ASOC_CARD tristate "Generic ASoC Sound Card with ASRC support" depends on OF && I2C + # enforce SND_SOC_FSL_ASOC_CARD=m if SND_AC97_CODEC=m: + depends on SND_AC97_CODEC || SND_AC97_CODEC=n select SND_SOC_IMX_AUDMUX select SND_SOC_IMX_PCM_DMA select SND_SOC_FSL_ESAI |
