linux/sound/soc/fsl
Shawn Guo 93d7b7622c Revert "ASoC: fsl: fix multiple definition of init_module"
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>
2013-01-28 14:46:09 +08:00
..
efika-audio-fabric.c ASoC: fsl: Add .owner to struct snd_soc_card 2011-12-22 17:34:32 +00:00
eukrea-tlv320.c ASoC: fsl: remove __dev* attributes 2012-12-10 00:30:25 +09:00
fsl_dma.c ASoC: fsl: remove __dev* attributes 2012-12-10 00:30:25 +09:00
fsl_dma.h ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
fsl_ssi.c ASoC: fsl: remove __dev* attributes 2012-12-10 00:30:25 +09:00
fsl_ssi.h ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
fsl_utils.c ASoC: fsl: remove helper fsl_asoc_get_codec_dev_name 2012-04-01 11:28:27 +01:00
fsl_utils.h ASoC: fsl: remove helper fsl_asoc_get_codec_dev_name 2012-04-01 11:28:27 +01:00
imx-audmux.c ASoC: fsl: remove __dev* attributes 2012-12-10 00:30:25 +09:00
imx-audmux.h ASoC imx-audmux: add MX31_AUDMUX_PORT7_SSI_PINS_7 define 2012-07-18 22:09:40 +01:00
imx-mc13783.c ASoC: fsl: remove __dev* attributes 2012-12-10 00:30:25 +09:00
imx-pcm-dma.c ASoC: fsl: remove __dev* attributes 2012-12-10 00:30:25 +09:00
imx-pcm-fiq.c Sound updates for 3.8-rc1 2012-12-13 11:51:23 -08:00
imx-pcm.c Revert "ASoC: fsl: fix multiple definition of init_module" 2013-01-28 14:46:09 +08:00
imx-pcm.h ASoC: fsl: assign dma peripheral type according to bus topology 2012-04-01 11:28:29 +01:00
imx-sgtl5000.c ASoC: fsl: remove __dev* attributes 2012-12-10 00:30:25 +09:00
imx-ssi.c Sound updates for 3.8-rc1 2012-12-13 11:51:23 -08:00
imx-ssi.h ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
Kconfig Revert "ASoC: fsl: fix multiple definition of init_module" 2013-01-28 14:46:09 +08:00
Makefile Revert "ASoC: fsl: fix multiple definition of init_module" 2013-01-28 14:46:09 +08:00
mpc5200_dma.c ASoC: fsl: mpc5200 combine psc_dma platform data 2012-09-18 23:03:42 -04:00
mpc5200_dma.h ASoC: fsl: mpc5200 combine psc_dma platform data 2012-09-18 23:03:42 -04:00
mpc5200_psc_ac97.c ASoC: fsl: remove __dev* attributes 2012-12-10 00:30:25 +09:00
mpc5200_psc_ac97.h ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
mpc5200_psc_i2s.c ASoC: fsl: remove __dev* attributes 2012-12-10 00:30:25 +09:00
mpc8610_hpcd.c ASoC: fsl: remove __dev* attributes 2012-12-10 00:30:25 +09:00
mx27vis-aic32x4.c ASoC: fsl: remove __dev* attributes 2012-12-10 00:30:25 +09:00
p1022_ds.c ASoC: fsl: remove __dev* attributes 2012-12-10 00:30:25 +09:00
p1022_rdk.c ASoC: fsl: remove __dev* attributes 2012-12-10 00:30:25 +09:00
pcm030-audio-fabric.c ASoC: fsl: remove __dev* attributes 2012-12-10 00:30:25 +09:00
phycore-ac97.c ASoC: imx: merge sound/soc/imx into sound/soc/fsl 2012-04-01 11:28:26 +01:00
wm1133-ev1.c ASoC: imx: merge sound/soc/imx into sound/soc/fsl 2012-04-01 11:28:26 +01:00