]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
powerpc/5200: Fix build error in sound code.
authorGrant Likely <grant.likely@secretlab.ca>
Mon, 14 Jun 2010 06:03:34 +0000 (00:03 -0600)
committerGrant Likely <grant.likely@secretlab.ca>
Tue, 15 Jun 2010 20:47:04 +0000 (14:47 -0600)
commitf487537c2b6b23332bbea7ecb1fe793b6c74d5b2
tree920af756a049a2b084c56b600c7493031f00eab4
parentfb73538e10c7fc4823a56e97bba600c2f9294012
powerpc/5200: Fix build error in sound code.

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>
sound/soc/fsl/mpc5200_dma.h