summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-06-17 11:07:35 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2010-06-17 11:07:35 +1000
commit5b0c477fe898ab112b775722d7d4af4362c6f515 (patch)
tree69711184016e7ce1f60157cd6200777d29f560e2 /sound
parentff5b5f8f4f224b74ef864a1af215b6159916123d (diff)
parent2b07be2493681220cac4d185494a4edb0b8efd1e (diff)
Merge remote branch 'gcl-current/merge'
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/fsl/mpc5200_dma.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/fsl/mpc5200_dma.h b/sound/soc/fsl/mpc5200_dma.h
index 22208b373fb9..e1ec6d91ea38 100644
--- 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)