diff options
author | Takashi Iwai <tiwai@suse.de> | 2017-02-20 10:52:50 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-02-20 10:52:50 +0300 |
commit | fc0e23fad33198fc7d74227dba7bbc3a5d7755aa (patch) | |
tree | 669319e33fb63a456986b6ac41cf3b584f583caf /include/sound/rawmidi.h | |
parent | af677166cf63c179dc2485053166e02c4aea01eb (diff) | |
parent | 3bb9eca913025ed05c0510de831c67b7bef652c5 (diff) | |
download | linux-fc0e23fad33198fc7d74227dba7bbc3a5d7755aa.tar.xz |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'include/sound/rawmidi.h')
-rw-r--r-- | include/sound/rawmidi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/sound/rawmidi.h b/include/sound/rawmidi.h index f730b91e472f..492a3ca7f17b 100644 --- a/include/sound/rawmidi.h +++ b/include/sound/rawmidi.h @@ -103,7 +103,7 @@ struct snd_rawmidi_substream { struct snd_rawmidi_runtime *runtime; struct pid *pid; /* hardware layer */ - struct snd_rawmidi_ops *ops; + const struct snd_rawmidi_ops *ops; }; struct snd_rawmidi_file { @@ -155,7 +155,7 @@ int snd_rawmidi_new(struct snd_card *card, char *id, int device, int output_count, int input_count, struct snd_rawmidi **rmidi); void snd_rawmidi_set_ops(struct snd_rawmidi *rmidi, int stream, - struct snd_rawmidi_ops *ops); + const struct snd_rawmidi_ops *ops); /* callbacks */ |