ASoC: atmel_pcm: make it buildable as module (d8976cfd) · Commits · 戴 / test

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>

sound/soc/atmel/atmel-pcm.h

+4 −2

Original line number	Diff line number	Diff line
		@@ -88,7 +88,8 @@ void atmel_pcm_free(struct snd_pcm *pcm);
		int atmel_pcm_mmap(struct snd_pcm_substream *substream,
		struct vm_area_struct *vma);

		#ifdef CONFIG_SND_ATMEL_SOC_PDC
		#if defined(CONFIG_SND_ATMEL_SOC_PDC) \|\| \
		defined(CONFIG_SND_ATMEL_SOC_PDC_MODULE)
		int atmel_pcm_pdc_platform_register(struct device *dev);
		void atmel_pcm_pdc_platform_unregister(struct device *dev);
		#else
		@@ -101,7 +102,8 @@ static inline void atmel_pcm_pdc_platform_unregister(struct device *dev)
		}
		#endif

		#ifdef CONFIG_SND_ATMEL_SOC_DMA
		#if defined(CONFIG_SND_ATMEL_SOC_DMA) \|\| \
		defined(CONFIG_SND_ATMEL_SOC_DMA_MODULE)
		int atmel_pcm_dma_platform_register(struct device *dev);
		void atmel_pcm_dma_platform_unregister(struct device *dev);
		#else

Admin message