aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/sound/soc/nuc900
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-10-27 10:43:40 +0200
committerTakashi Iwai <tiwai@suse.de>2011-10-27 10:43:40 +0200
commitbb14eb0da72afb69be261b28ec858cbd5a35e089 (patch)
treefa72a87d21e506c990b63657d782936311cfa7cf /sound/soc/nuc900
parentMerge branch 'topic/remove-irqf_disable' into for-linus (diff)
parentASoC: wm8940: Properly set codec->dapm.bias_level (diff)
downloadwireguard-linux-bb14eb0da72afb69be261b28ec858cbd5a35e089.tar.xz
wireguard-linux-bb14eb0da72afb69be261b28ec858cbd5a35e089.zip
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/nuc900')
-rw-r--r--sound/soc/nuc900/nuc900-pcm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/nuc900/nuc900-pcm.c b/sound/soc/nuc900/nuc900-pcm.c
index 865b288bd748..ae8d6806966b 100644
--- a/sound/soc/nuc900/nuc900-pcm.c
+++ b/sound/soc/nuc900/nuc900-pcm.c
@@ -227,7 +227,7 @@ static int nuc900_dma_trigger(struct snd_pcm_substream *substream, int cmd)
return ret;
}
-int nuc900_dma_getposition(struct snd_pcm_substream *substream,
+static int nuc900_dma_getposition(struct snd_pcm_substream *substream,
dma_addr_t *src, dma_addr_t *dst)
{
struct snd_pcm_runtime *runtime = substream->runtime;