diff --git a/[refs] b/[refs] index 901e1dcacde0..db7ff918b953 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2d512a978ceda557a456d39d88cfc1eb60194e9 +refs/heads/master: d555a552aeeef45d097f1d3ea2c6dcce6839f1dd diff --git a/trunk/sound/soc/imx/mx1_mx2-pcm.c b/trunk/sound/soc/imx/mx1_mx2-pcm.c index 16efd8a7a16d..b83866529397 100644 --- a/trunk/sound/soc/imx/mx1_mx2-pcm.c +++ b/trunk/sound/soc/imx/mx1_mx2-pcm.c @@ -376,7 +376,7 @@ static int mx1_mx2_pcm_mmap(struct snd_pcm_substream *substream, runtime->dma_bytes); } -struct snd_pcm_ops mx1_mx2_pcm_ops = { +static struct snd_pcm_ops mx1_mx2_pcm_ops = { .open = mx1_mx2_pcm_open, .close = mx1_mx2_pcm_close, .ioctl = snd_pcm_lib_ioctl, @@ -434,7 +434,7 @@ static void mx1_mx2_pcm_free_dma_buffers(struct snd_pcm *pcm) } } -int mx1_mx2_pcm_new(struct snd_card *card, struct snd_soc_dai *dai, +static int mx1_mx2_pcm_new(struct snd_card *card, struct snd_soc_dai *dai, struct snd_pcm *pcm) { int ret = 0;