From: Mark Brown <broonie@kernel.org>
Date: Mon, 14 Aug 2017 16:53:16 +0000 (+0100)
Subject: Merge branch 'topic/sh' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: v4.14-rc1~40^2~15^2~16^2~5
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=ce25f0d6e750a808118b699fe9f917c954710cc8;p=linux-block.git

Merge branch 'topic/sh' of git://git./linux/kernel/git/broonie/sound into asoc-rcar
---

ce25f0d6e750a808118b699fe9f917c954710cc8
diff --cc sound/soc/sh/rcar/core.c
index 650cc28b0fb6,08f3a06978e1..df39831b8e8f
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@@ -1140,7 -1158,8 +1140,7 @@@ static snd_pcm_uframes_t rsnd_pointer(s
  	return pointer;
  }
  
- static struct snd_pcm_ops rsnd_pcm_ops = {
+ static const struct snd_pcm_ops rsnd_pcm_ops = {
 -	.open		= rsnd_pcm_open,
  	.ioctl		= snd_pcm_lib_ioctl,
  	.hw_params	= rsnd_hw_params,
  	.hw_free	= snd_pcm_lib_free_pages,