Merge branch 'topic/sh' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

diff --cc sound/soc/sh/rcar/core.c
index 650cc28b0fb6db7df9513bee2ce5ee20c96249ec,08f3a06978e102107882d2ab1fd86f81bcdd4ddb..df39831b8e8f44ffb21b51ca004deb01695c7c54
--- 1/sound/soc/sh/rcar/core.c
--- 2/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,