android_kernel_motorola_sm6225/sound/soc
Shawn Guo 25b8d31488 ASoC: fsl: fix multiple definition of init_module
With commit f2818d0 (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: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2013-01-12 00:05:14 +00:00
..
atmel ASoC: atmel: remove __dev* attributes 2012-12-10 00:31:03 +09:00
au1x ASoC: au1x: remove __dev* attributes 2012-12-10 00:31:06 +09:00
blackfin ASoC: blackfin: remove __dev* attributes 2012-12-10 00:29:39 +09:00
cirrus ASoC: cirrus: remove __dev* attributes 2012-12-10 00:31:09 +09:00
codecs Merge remote-tracking branch 'asoc/topic/tpa6130a2' into asoc-next 2012-12-15 23:56:46 +09:00
davinci ASoC: McASP: implement a way to force BCLK/LRCLK ratios 2012-12-07 14:47:10 +09:00
dwc ASoC: dwc: Staticise non-exported i2s_start() 2012-07-04 19:15:43 +01:00
fsl ASoC: fsl: fix multiple definition of init_module 2013-01-12 00:05:14 +00:00
generic ASoC: add generic simple-card support 2012-04-13 11:29:25 +01:00
jz4740 ASoC: jz4740: remove __dev* attributes 2012-12-10 00:31:12 +09:00
kirkwood ASoC: kirkwood: remove __dev* attributes 2012-12-10 00:31:24 +09:00
mid-x86 ASoC: mid-x86: remove __dev* attributes 2012-12-10 00:31:14 +09:00
mxs ASoC: mxs: remove __dev* attributes 2012-12-10 00:31:26 +09:00
nuc900 ASoC: nuc900: remove __dev* attributes 2012-12-10 00:31:28 +09:00
omap Sound updates for 3.8-rc1 2012-12-13 11:51:23 -08:00
pxa ASoC: pxa: remove __dev* attributes 2012-12-10 00:30:34 +09:00
s6000 ASoC: s6000: remove __dev* attributes 2012-12-10 00:31:34 +09:00
samsung ASoC: Samsung: remove __dev* attributes 2012-12-10 00:30:19 +09:00
sh ASoC: sh: remove __dev* attributes 2012-12-10 00:31:36 +09:00
spear ASoC: spear: remove __dev* attributes 2012-12-10 00:31:38 +09:00
tegra Sound updates for 3.8-rc1 2012-12-13 11:51:23 -08:00
txx9 ASoC: txx9: remove __dev* attributes 2012-12-10 00:31:43 +09:00
ux500 Sound updates for 3.8-rc1 2012-12-13 11:51:23 -08:00
Kconfig ASoC: Rename ep93xx soc directory to cirrus 2012-08-28 10:24:21 -07:00
Makefile ASoC: dmaengine: Correct Makefile when sound is built as module 2012-10-09 15:57:33 +09:00
soc-cache.c ASoC: cache: Standardise ASoC cache messages 2012-11-21 11:39:51 +09:00
soc-compress.c ASoC: Prevent pop_wait overwrite 2012-12-15 23:45:09 +09:00
soc-core.c Merge remote-tracking branch 'asoc/topic/log' into asoc-next 2012-12-15 23:56:45 +09:00
soc-dapm.c ASoC: dapm: Standardise ASoC DAPM messages 2012-11-21 11:39:48 +09:00
soc-dmaengine-pcm.c ASoC: dmaengine_pcm: set MODULE_LICENSE 2012-11-23 23:42:54 +09:00
soc-io.c ASoC: io: Don't dereference regmap if we failed to get one 2012-06-23 12:11:32 +01:00
soc-jack.c Merge remote-tracking branch 'asoc/topic/log' into asoc-next 2012-12-10 00:22:14 +09:00
soc-pcm.c Merge remote-tracking branch 'asoc/topic/core' into asoc-next 2012-12-15 23:56:43 +09:00
soc-utils.c ASoC: utils: remove __dev* attributes 2012-12-10 00:31:48 +09:00