On Mon, Jun 14, 2010 at 12:08 AM, Grant Likely grant.likely@secretlab.ca wrote:

On Sat, Jun 12, 2010 at 2:56 PM, Jon Smirl jonsmirl@gmail.com wrote:

...

Grant, is this something you did?

Please try the attached fix.

Mark, I just got an okay on this one from John Linkhorst. It's such a trivial fix that I'm just going to merge it via my tree.

g.

g.

...

commit 1d8222e8df07ce4f86fb7fa80b02bdee03b57985 Author: Grant Likely grant.likely@secretlab.ca Date:   Sat Nov 7 01:34:31 2009 -0700

ASoC/mpc5200: add to_psc_dma_stream() helper

Move the resolving of the psc_dma_stream pointer to a helper function    to reduce duplicate code

Signed-off-by: Grant Likely grant.likely@secretlab.ca    Acked-by: Liam Girdwood lrg@slimlogic.co.uk    Signed-off-by: Mark Brown broonie@opensource.wolfsonmicro.com

On Sat, Jun 12, 2010 at 4:30 PM, John Hilmar Linkhorst John.Linkhorst@rwth-aachen.de wrote:

...

Dear Jon,

while compiling the kernel for my efika machine I ran into the following error:

LD      sound/soc/fsl/built-in.o 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

could you help me solving this problem?

best regards John Linkhorst

-- Jon Smirl jonsmirl@gmail.com

-- Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd.