diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-10-27 04:43:40 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-10-27 04:43:40 -0400 |
| commit | bb14eb0da72afb69be261b28ec858cbd5a35e089 (patch) | |
| tree | fa72a87d21e506c990b63657d782936311cfa7cf /sound/soc/nuc900 | |
| parent | 9430148d800dd929ad73da4c6afb67f793f8af43 (diff) | |
| parent | 5927f94700e860ae27ff24e7f3bc9e4f7b9922eb (diff) | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/nuc900')
| -rw-r--r-- | sound/soc/nuc900/nuc900-pcm.c | 2 |
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) | |||
| 227 | return ret; | 227 | return ret; |
| 228 | } | 228 | } |
| 229 | 229 | ||
| 230 | int nuc900_dma_getposition(struct snd_pcm_substream *substream, | 230 | static int nuc900_dma_getposition(struct snd_pcm_substream *substream, |
| 231 | dma_addr_t *src, dma_addr_t *dst) | 231 | dma_addr_t *src, dma_addr_t *dst) |
| 232 | { | 232 | { |
| 233 | struct snd_pcm_runtime *runtime = substream->runtime; | 233 | struct snd_pcm_runtime *runtime = substream->runtime; |