diff options
author | Bo Shen <voice.shen@atmel.com> | 2013-01-30 22:53:37 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-04 13:34:13 -0500 |
commit | d8976cfd8257cd9539f19cd7fe512be468ed8118 (patch) | |
tree | efd2a5ae8789c88b49f99ce812a86cee442404b4 /sound/soc/atmel/atmel-pcm.h | |
parent | 153f5a18e4a88d8a3c2d1a19658a3ce34559b473 (diff) |
ASoC: atmel_pcm: make it buildable as module
When build as module, it reports following error, using this patch
fix it
sound/soc/atmel/atmel-pcm-pdc.c:387: error: redefinition of 'atmel_pcm_pdc_platform_register'
sound/soc/atmel/atmel-pcm.h:95: note: previous definition of 'atmel_pcm_pdc_platform_register' was here
sound/soc/atmel/atmel-pcm-pdc.c:393: error: redefinition of 'atmel_pcm_pdc_platform_unregister'
sound/soc/atmel/atmel-pcm.h:99: note: previous definition of 'atmel_pcm_pdc_platform_unregister' was here
Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/atmel/atmel-pcm.h')
-rw-r--r-- | sound/soc/atmel/atmel-pcm.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/atmel/atmel-pcm.h b/sound/soc/atmel/atmel-pcm.h index bb45d20e7250..12ae814eff21 100644 --- a/sound/soc/atmel/atmel-pcm.h +++ b/sound/soc/atmel/atmel-pcm.h | |||
@@ -88,7 +88,8 @@ void atmel_pcm_free(struct snd_pcm *pcm); | |||
88 | int atmel_pcm_mmap(struct snd_pcm_substream *substream, | 88 | int atmel_pcm_mmap(struct snd_pcm_substream *substream, |
89 | struct vm_area_struct *vma); | 89 | struct vm_area_struct *vma); |
90 | 90 | ||
91 | #ifdef CONFIG_SND_ATMEL_SOC_PDC | 91 | #if defined(CONFIG_SND_ATMEL_SOC_PDC) || \ |
92 | defined(CONFIG_SND_ATMEL_SOC_PDC_MODULE) | ||
92 | int atmel_pcm_pdc_platform_register(struct device *dev); | 93 | int atmel_pcm_pdc_platform_register(struct device *dev); |
93 | void atmel_pcm_pdc_platform_unregister(struct device *dev); | 94 | void atmel_pcm_pdc_platform_unregister(struct device *dev); |
94 | #else | 95 | #else |
@@ -101,7 +102,8 @@ static inline void atmel_pcm_pdc_platform_unregister(struct device *dev) | |||
101 | } | 102 | } |
102 | #endif | 103 | #endif |
103 | 104 | ||
104 | #ifdef CONFIG_SND_ATMEL_SOC_DMA | 105 | #if defined(CONFIG_SND_ATMEL_SOC_DMA) || \ |
106 | defined(CONFIG_SND_ATMEL_SOC_DMA_MODULE) | ||
105 | int atmel_pcm_dma_platform_register(struct device *dev); | 107 | int atmel_pcm_dma_platform_register(struct device *dev); |
106 | void atmel_pcm_dma_platform_unregister(struct device *dev); | 108 | void atmel_pcm_dma_platform_unregister(struct device *dev); |
107 | #else | 109 | #else |