Prev: [037/205] NFSv4: Fix an embarassing typo in encode_attrs()
Next: [030/205] sky2: Restore multicast after restart
From: Greg KH on 30 Jul 2010 14:40
2.6.34-stable review patch. If anyone has any objections, please let us know.

------------------

From: Grant Likely <grant.likely(a)secretlab.ca>

commit f487537c2b6b23332bbea7ecb1fe793b6c74d5b2 upstream.

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(a)secretlab.ca>
Cc: Jon Smirl <jonsmirl(a)gmail.com>
Tested-by: John Hilmar Linkhorst <John.Linkhorst(a)rwth-aachen.de>
Acked-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com>
Cc: Peter Korsgaard <jacmet(a)sunsite.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

---
sound/soc/fsl/mpc5200_dma.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/sound/soc/fsl/mpc5200_dma.h
+++ b/sound/soc/fsl/mpc5200_dma.h
@@ -73,7 +73,7 @@ struct psc_dma {
};

/* Utility for retrieving psc_dma_stream structure from a substream */
-inline struct psc_dma_stream *
+static inline struct psc_dma_stream *
to_psc_dma_stream(struct snd_pcm_substream *substream, struct psc_dma *psc_dma)
{
if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE)


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [037/205] NFSv4: Fix an embarassing typo in encode_attrs()
Next: [030/205] sky2: Restore multicast after restart