summaryrefslogtreecommitdiff
path: root/sound/soc/spear
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-12 13:57:17 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-12 13:57:17 +0100
commiteeb7f91e3511d2b1338b3fae915e800d781627f8 (patch)
tree186b669f5d0d431741320dfd81d6cc22c8a511ed /sound/soc/spear
parent4b6142ae93cc9c81ec5f43b0976ee7d24619f041 (diff)
parent18b97dbe86735502794ba988d4171dc531d8a589 (diff)
downloadlinux-3.10-eeb7f91e3511d2b1338b3fae915e800d781627f8.tar.gz
linux-3.10-eeb7f91e3511d2b1338b3fae915e800d781627f8.tar.bz2
linux-3.10-eeb7f91e3511d2b1338b3fae915e800d781627f8.zip
Merge remote-tracking branch 'asoc/topic/spear' into asoc-next
Diffstat (limited to 'sound/soc/spear')
-rw-r--r--sound/soc/spear/spear_pcm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/spear/spear_pcm.c b/sound/soc/spear/spear_pcm.c
index 23fb09addd2..bfbcc1fcfe6 100644
--- a/sound/soc/spear/spear_pcm.c
+++ b/sound/soc/spear/spear_pcm.c
@@ -25,7 +25,7 @@
#include <sound/soc.h>
#include <sound/spear_dma.h>
-struct snd_pcm_hardware spear_pcm_hardware = {
+static struct snd_pcm_hardware spear_pcm_hardware = {
.info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER |
SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID |
SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME),
@@ -164,7 +164,7 @@ static int spear_pcm_new(struct snd_soc_pcm_runtime *rtd)
return 0;
}
-struct snd_soc_platform_driver spear_soc_platform = {
+static struct snd_soc_platform_driver spear_soc_platform = {
.ops = &spear_pcm_ops,
.pcm_new = spear_pcm_new,
.pcm_free = spear_pcm_free,