forked from luck/tmp_suning_uos_patched
f487537c2b
Compiling in the MPC5200 sound drivers results in the following build error: sound/soc/fsl/mpc5200_psc_ac97.o: In function `to_psc_dma_stream': mpc5200_psc_ac97.c:(.text+0x0): multiple definition of `to_psc_dma_stream' sound/soc/fsl/mpc5200_dma.o:mpc5200_dma.c:(.text+0x0): first defined here sound/soc/fsl/efika-audio-fabric.o: In function `to_psc_dma_stream': efika-audio-fabric.c:(.text+0x0): multiple definition of `to_psc_dma_stream' sound/soc/fsl/mpc5200_dma.o:mpc5200_dma.c:(.text+0x0): first defined here make[3]: *** [sound/soc/fsl/built-in.o] Error 1 make[2]: *** [sound/soc/fsl] Error 2 make[1]: *** [sound/soc] Error 2 make: *** [sound] Error 2 This patch fixes it by declaring the inline function in the header file to also be a static. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Cc: Jon Smirl <jonsmirl@gmail.com> Tested-by: John Hilmar Linkhorst <John.Linkhorst@rwth-aachen.de> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> |
||
|---|---|---|
| .. | ||
| efika-audio-fabric.c | ||
| fsl_dma.c | ||
| fsl_dma.h | ||
| fsl_ssi.c | ||
| fsl_ssi.h | ||
| Kconfig | ||
| Makefile | ||
| mpc5200_dma.c | ||
| mpc5200_dma.h | ||
| mpc5200_psc_ac97.c | ||
| mpc5200_psc_ac97.h | ||
| mpc5200_psc_i2s.c | ||
| mpc5200_psc_i2s.h | ||
| mpc8610_hpcd.c | ||
| pcm030-audio-fabric.c | ||
| soc-of-simple.c | ||