mirror of
https://github.com/torvalds/linux.git
synced 2024-11-08 05:01:48 +00:00
93d7b7622c
This reverts commit 25b8d31488.
While the commit fixes multiple init_module definition error with
module build, it breaks build when both imx-pcm-fiq and imx-pcm-dma
are built in as below.
LD sound/soc/fsl/snd-soc-fsl-ssi.o
LD sound/soc/fsl/snd-soc-fsl-utils.o
LD sound/soc/fsl/snd-soc-imx-ssi.o
LD sound/soc/fsl/snd-soc-imx-audmux.o
LD sound/soc/fsl/snd-soc-imx-pcm-fiq.o
LD sound/soc/fsl/snd-soc-imx-pcm-dma.o
LD sound/soc/fsl/snd-soc-eukrea-tlv320.o
LD sound/soc/fsl/snd-soc-imx-sgtl5000.o
LD sound/soc/fsl/snd-soc-imx-mc13783.o
LD sound/soc/fsl/built-in.o
sound/soc/fsl/snd-soc-imx-pcm-dma.o: In function `imx_pcm_free':
imx-pcm.c:(.text+0x464): multiple definition of `imx_pcm_free'
sound/soc/fsl/snd-soc-imx-pcm-fiq.o:imx-pcm-fiq.c:(.text+0x1a8): first defined here
sound/soc/fsl/snd-soc-imx-pcm-dma.o: In function `snd_imx_pcm_mmap':
imx-pcm.c:(.text+0x35c): multiple definition of `snd_imx_pcm_mmap'
sound/soc/fsl/snd-soc-imx-pcm-fiq.o:imx-pcm-fiq.c:(.text+0xa0): first defined here
sound/soc/fsl/snd-soc-imx-pcm-dma.o: In function `imx_pcm_new':
imx-pcm.c:(.text+0x3dc): multiple definition of `imx_pcm_new'
sound/soc/fsl/snd-soc-imx-pcm-fiq.o:imx-pcm-fiq.c:(.text+0x120): first defined here
make[4]: *** [sound/soc/fsl/built-in.o] Error 1
Let's revert the commit and find a proper fix for multiple init_module
definition error later.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
60 lines
2.1 KiB
Makefile
60 lines
2.1 KiB
Makefile
# MPC8610 HPCD Machine Support
|
|
snd-soc-mpc8610-hpcd-objs := mpc8610_hpcd.o
|
|
obj-$(CONFIG_SND_SOC_MPC8610_HPCD) += snd-soc-mpc8610-hpcd.o
|
|
|
|
# P1022 DS Machine Support
|
|
snd-soc-p1022-ds-objs := p1022_ds.o
|
|
obj-$(CONFIG_SND_SOC_P1022_DS) += snd-soc-p1022-ds.o
|
|
|
|
# P1022 RDK Machine Support
|
|
snd-soc-p1022-rdk-objs := p1022_rdk.o
|
|
obj-$(CONFIG_SND_SOC_P1022_RDK) += snd-soc-p1022-rdk.o
|
|
|
|
# Freescale PowerPC SSI/DMA Platform Support
|
|
snd-soc-fsl-ssi-objs := fsl_ssi.o
|
|
snd-soc-fsl-utils-objs := fsl_utils.o
|
|
snd-soc-fsl-dma-objs := fsl_dma.o
|
|
obj-$(CONFIG_SND_SOC_FSL_SSI) += snd-soc-fsl-ssi.o
|
|
obj-$(CONFIG_SND_SOC_FSL_UTILS) += snd-soc-fsl-utils.o
|
|
obj-$(CONFIG_SND_SOC_POWERPC_DMA) += snd-soc-fsl-dma.o
|
|
|
|
# MPC5200 Platform Support
|
|
obj-$(CONFIG_SND_MPC52xx_DMA) += mpc5200_dma.o
|
|
obj-$(CONFIG_SND_SOC_MPC5200_I2S) += mpc5200_psc_i2s.o
|
|
obj-$(CONFIG_SND_SOC_MPC5200_AC97) += mpc5200_psc_ac97.o
|
|
|
|
# MPC5200 Machine Support
|
|
obj-$(CONFIG_SND_MPC52xx_SOC_PCM030) += pcm030-audio-fabric.o
|
|
obj-$(CONFIG_SND_MPC52xx_SOC_EFIKA) += efika-audio-fabric.o
|
|
|
|
# i.MX Platform Support
|
|
snd-soc-imx-ssi-objs := imx-ssi.o
|
|
snd-soc-imx-audmux-objs := imx-audmux.o
|
|
snd-soc-imx-pcm-objs := imx-pcm.o
|
|
ifneq ($(CONFIG_SND_SOC_IMX_PCM_FIQ),)
|
|
snd-soc-imx-pcm-objs += imx-pcm-fiq.o
|
|
endif
|
|
ifneq ($(CONFIG_SND_SOC_IMX_PCM_DMA),)
|
|
snd-soc-imx-pcm-objs += imx-pcm-dma.o
|
|
endif
|
|
|
|
obj-$(CONFIG_SND_SOC_IMX_SSI) += snd-soc-imx-ssi.o
|
|
obj-$(CONFIG_SND_SOC_IMX_AUDMUX) += snd-soc-imx-audmux.o
|
|
|
|
obj-$(CONFIG_SND_SOC_IMX_PCM) += snd-soc-imx-pcm.o
|
|
|
|
# i.MX Machine Support
|
|
snd-soc-eukrea-tlv320-objs := eukrea-tlv320.o
|
|
snd-soc-phycore-ac97-objs := phycore-ac97.o
|
|
snd-soc-mx27vis-aic32x4-objs := mx27vis-aic32x4.o
|
|
snd-soc-wm1133-ev1-objs := wm1133-ev1.o
|
|
snd-soc-imx-sgtl5000-objs := imx-sgtl5000.o
|
|
snd-soc-imx-mc13783-objs := imx-mc13783.o
|
|
|
|
obj-$(CONFIG_SND_SOC_EUKREA_TLV320) += snd-soc-eukrea-tlv320.o
|
|
obj-$(CONFIG_SND_SOC_PHYCORE_AC97) += snd-soc-phycore-ac97.o
|
|
obj-$(CONFIG_SND_SOC_MX27VIS_AIC32X4) += snd-soc-mx27vis-aic32x4.o
|
|
obj-$(CONFIG_SND_MXC_SOC_WM1133_EV1) += snd-soc-wm1133-ev1.o
|
|
obj-$(CONFIG_SND_SOC_IMX_SGTL5000) += snd-soc-imx-sgtl5000.o
|
|
obj-$(CONFIG_SND_SOC_IMX_MC13783) += snd-soc-imx-mc13783.o
|