diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-17 12:20:22 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-17 12:20:22 -0400 |
| commit | 65027372763b1ed02730839ed0b9d2eea5778aa2 (patch) | |
| tree | eac9daee8778c725e07a84901e5bda6432876a86 /sound/soc/kirkwood | |
| parent | 46dd30a8930fdd5cadd7f90376fa8df9c73ae90e (diff) | |
| parent | 5d0c8a58747c84efe93fb632ae25eb377aea1fa0 (diff) | |
Merge remote-tracking branch 'asoc/topic/kirkwood' into asoc-next
Diffstat (limited to 'sound/soc/kirkwood')
| -rw-r--r-- | sound/soc/kirkwood/kirkwood-dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/kirkwood/kirkwood-dma.c b/sound/soc/kirkwood/kirkwood-dma.c index d3d4bdca1cc6..a9f14530c3db 100644 --- a/sound/soc/kirkwood/kirkwood-dma.c +++ b/sound/soc/kirkwood/kirkwood-dma.c | |||
| @@ -289,7 +289,7 @@ static snd_pcm_uframes_t kirkwood_dma_pointer(struct snd_pcm_substream | |||
| 289 | return count; | 289 | return count; |
| 290 | } | 290 | } |
| 291 | 291 | ||
| 292 | struct snd_pcm_ops kirkwood_dma_ops = { | 292 | static struct snd_pcm_ops kirkwood_dma_ops = { |
| 293 | .open = kirkwood_dma_open, | 293 | .open = kirkwood_dma_open, |
| 294 | .close = kirkwood_dma_close, | 294 | .close = kirkwood_dma_close, |
| 295 | .ioctl = snd_pcm_lib_ioctl, | 295 | .ioctl = snd_pcm_lib_ioctl, |