• Shawn Guo's avatar
    ASoC: fsl: fix multiple definition of init_module · 25b8d314
    Shawn Guo authored
    With commit f2818d07 (ASoC: fsl: fix miscompilation of snd-soc-imx-pcm),
    we will see the following build error when building modules with
    CONFIG_SND_IMX_SOC=m in imx_v6_v7_defconfig.
    
      CC [M]  sound/soc/fsl/phycore-ac97.o
      LD [M]  sound/soc/fsl/snd-soc-fsl-ssi.o
      LD [M]  sound/soc/fsl/snd-soc-fsl-utils.o
      LD [M]  sound/soc/fsl/snd-soc-imx-ssi.o
      LD [M]  sound/soc/fsl/snd-soc-imx-audmux.o
      LD [M]  sound/soc/fsl/snd-soc-imx-pcm.o
    sound/soc/fsl/imx-pcm-dma.o: In function `init_module':
    imx-pcm-dma.c:(.init.text+0x0): multiple definition of `init_module'
    sound/soc/fsl/imx-pcm-fiq.o:imx-pcm-fiq.c:(.init.text+0x0): first defined here
    sound/soc/fsl/imx-pcm-dma.o: In function `cleanup_module':
    imx-pcm-dma.c:(.exit.text+0x0): multiple definition of `cleanup_module'
    sound/soc/fsl/imx-pcm-fiq.o:imx-pcm-fiq.c:(.exit.text+0x0): first defined here
    make[4]: *** [sound/soc/fsl/snd-soc-imx-pcm.o] Error 1
    
    Instead of using bool for SND_SOC_IMX_PCM_FIQ and SND_SOC_IMX_PCM_DMA
    to fix the original issue, we should completely remove SND_SOC_IMX_PCM
    and have imx-pcm.o statically linked with imx-pcm-fiq.o or imx-pcm-dma.o.
    Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
    Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
    25b8d314
Makefile 2.26 KB