linux-kernel-test/sound/soc
Grant Likely f487537c2b 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>
2010-06-15 14:47:04 -06:00
..
atmel ALSA: ASoC: move dma_data from snd_soc_dai to snd_soc_pcm_stream 2010-04-05 19:14:11 +01:00
au1x include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
blackfin Merge branch 'topic/asoc' into for-linus 2010-05-20 12:00:43 +02:00
codecs Merge branch 'for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc 2010-05-27 09:46:10 +02:00
davinci Merge branch 'topic/asoc' into for-linus 2010-05-20 12:00:43 +02:00
fsl powerpc/5200: Fix build error in sound code. 2010-06-15 14:47:04 -06:00
imx Merge branch 'for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc 2010-06-02 14:17:44 +02:00
omap Merge branch 'topic/asoc' into for-linus 2010-05-20 12:00:43 +02:00
pxa [ARM] pxa/spitz: Correctly register WM8750 2010-05-31 12:03:45 +08:00
s3c24xx ASoC: Allow active paths from the GSM modem while the GTA02 is suspended 2010-05-10 10:37:04 +01:00
s6000 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 2010-04-07 08:42:25 -07:00
sh Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 2010-05-29 15:31:57 -07:00
txx9 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx 2010-05-21 17:05:46 -07:00
Kconfig ASoC: Hook i.MX into build 2009-08-15 11:37:30 +01:00
Makefile ASoC: Add bit clock rate calculator utility functions 2009-11-12 16:45:48 +00:00
soc-cache.c ASoC: Add debug output tracing all cache register writes 2010-05-05 15:10:17 +01:00
soc-core.c Merge branch 'topic/asoc' into for-linus 2010-05-20 12:00:43 +02:00
soc-dapm.c Merge branch 'topic/asoc' into for-linus 2010-05-20 12:00:43 +02:00
soc-jack.c ASoC: Allow reporting of NULL jacks 2010-04-23 17:07:10 +01:00
soc-utils.c ASoC: Add BCLK calculation utility for TDM mode too 2009-11-25 19:55:46 +00:00