diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 08:57:17 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 08:57:17 -0400 |
| commit | eeb7f91e3511d2b1338b3fae915e800d781627f8 (patch) | |
| tree | 186b669f5d0d431741320dfd81d6cc22c8a511ed /sound/soc/spear | |
| parent | 4b6142ae93cc9c81ec5f43b0976ee7d24619f041 (diff) | |
| parent | 18b97dbe86735502794ba988d4171dc531d8a589 (diff) | |
Merge remote-tracking branch 'asoc/topic/spear' into asoc-next
Diffstat (limited to 'sound/soc/spear')
| -rw-r--r-- | sound/soc/spear/spear_pcm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/spear/spear_pcm.c b/sound/soc/spear/spear_pcm.c index 23fb09addd21..bfbcc1fcfe6f 100644 --- a/sound/soc/spear/spear_pcm.c +++ b/sound/soc/spear/spear_pcm.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | #include <sound/soc.h> | 25 | #include <sound/soc.h> |
| 26 | #include <sound/spear_dma.h> | 26 | #include <sound/spear_dma.h> |
| 27 | 27 | ||
| 28 | struct snd_pcm_hardware spear_pcm_hardware = { | 28 | static struct snd_pcm_hardware spear_pcm_hardware = { |
| 29 | .info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | | 29 | .info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | |
| 30 | SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | | 30 | SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | |
| 31 | SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME), | 31 | SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME), |
| @@ -164,7 +164,7 @@ static int spear_pcm_new(struct snd_soc_pcm_runtime *rtd) | |||
| 164 | return 0; | 164 | return 0; |
| 165 | } | 165 | } |
| 166 | 166 | ||
| 167 | struct snd_soc_platform_driver spear_soc_platform = { | 167 | static struct snd_soc_platform_driver spear_soc_platform = { |
| 168 | .ops = &spear_pcm_ops, | 168 | .ops = &spear_pcm_ops, |
| 169 | .pcm_new = spear_pcm_new, | 169 | .pcm_new = spear_pcm_new, |
| 170 | .pcm_free = spear_pcm_free, | 170 | .pcm_free = spear_pcm_free, |