summaryrefslogtreecommitdiffstats
path: root/sound/arm/pxa2xx-pcm.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-09-04 10:10:27 +0200
committerTakashi Iwai <tiwai@suse.de>2017-09-04 10:10:27 +0200
commit2a32a4d9c9cc4141abdf8e90f0cd167a614c9e91 (patch)
tree1cd995a5f989c879d3d71566a1fa2db9745c5263 /sound/arm/pxa2xx-pcm.c
parent1f7f51a63114bab3a05920f4b1343154e95e2cb6 (diff)
parent39cdc62b1b4efa39831d4de22f990043b0304fff (diff)
downloadlinux-2a32a4d9c9cc4141abdf8e90f0cd167a614c9e91.tar.bz2
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/arm/pxa2xx-pcm.c')
-rw-r--r--sound/arm/pxa2xx-pcm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/arm/pxa2xx-pcm.c b/sound/arm/pxa2xx-pcm.c
index 83fcfac97739..1c6f4b436de3 100644
--- a/sound/arm/pxa2xx-pcm.c
+++ b/sound/arm/pxa2xx-pcm.c
@@ -68,7 +68,7 @@ static int pxa2xx_pcm_close(struct snd_pcm_substream *substream)
return __pxa2xx_pcm_close(substream);
}
-static struct snd_pcm_ops pxa2xx_pcm_ops = {
+static const struct snd_pcm_ops pxa2xx_pcm_ops = {
.open = pxa2xx_pcm_open,
.close = pxa2xx_pcm_close,
.ioctl = snd_pcm_lib_ioctl,