diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-06-20 18:01:19 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-06-21 19:07:21 +0100 |
| commit | 3276d0aa0bf475cc6cfb505487b2a2f3f762aebb (patch) | |
| tree | e25dfd6be261d3575b706554f49d194508368ab1 /sound/soc/dwc | |
| parent | 5aa1418defb0e88fb7f70c5b112d531cfcede851 (diff) | |
| download | lwn-3276d0aa0bf475cc6cfb505487b2a2f3f762aebb.tar.gz lwn-3276d0aa0bf475cc6cfb505487b2a2f3f762aebb.zip | |
ASoC: dwc: make pcm support built-in when necessary
The new PIO mode for the dwc audio driver causes a link failure
when it is built as a loadable module but the audio driver is built-in:
sound/built-in.o: In function `i2s_irq_handler':
:(.text+0x58c64): undefined reference to `dw_pcm_push_tx'
sound/built-in.o: In function `dw_i2s_probe':
:(.text+0x593dc): undefined reference to `dw_pcm_register'
We could link both into a single module, but apparently the
author intended them to be separate, so this instead changes
the Makefile to force the pcm module to be built-in if the
base module is. This is a bit hacky but not as bad as trying
to work around it in Kconfig language.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 79361b2b98b7 ("ASoC: dwc: Add PIO PCM extension")
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/dwc')
| -rw-r--r-- | sound/soc/dwc/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/dwc/Makefile b/sound/soc/dwc/Makefile index 1b48bcccbc51..38f1ca31c5fa 100644 --- a/sound/soc/dwc/Makefile +++ b/sound/soc/dwc/Makefile @@ -1,4 +1,5 @@ # SYNOPSYS Platform Support obj-$(CONFIG_SND_DESIGNWARE_I2S) += designware_i2s.o -obj-$(CONFIG_SND_DESIGNWARE_PCM) += designware_pcm.o - +ifdef CONFIG_SND_DESIGNWARE_PCM +obj-$(CONFIG_SND_DESIGNWARE_I2S) += designware_pcm.o +endif |