diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-09-04 10:10:27 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-09-04 10:10:27 +0200 |
| commit | 2a32a4d9c9cc4141abdf8e90f0cd167a614c9e91 (patch) | |
| tree | 1cd995a5f989c879d3d71566a1fa2db9745c5263 /sound/sparc/dbri.c | |
| parent | 1f7f51a63114bab3a05920f4b1343154e95e2cb6 (diff) | |
| parent | 39cdc62b1b4efa39831d4de22f990043b0304fff (diff) | |
| download | linux-2a32a4d9c9cc4141abdf8e90f0cd167a614c9e91.tar.bz2 | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/sparc/dbri.c')
| -rw-r--r-- | sound/sparc/dbri.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c index 52063b262667..abc7bd5055eb 100644 --- a/sound/sparc/dbri.c +++ b/sound/sparc/dbri.c @@ -1980,7 +1980,7 @@ static irqreturn_t snd_dbri_interrupt(int irq, void *dev_id) /**************************************************************************** PCM Interface ****************************************************************************/ -static struct snd_pcm_hardware snd_dbri_pcm_hw = { +static const struct snd_pcm_hardware snd_dbri_pcm_hw = { .info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | @@ -2213,7 +2213,7 @@ static snd_pcm_uframes_t snd_dbri_pointer(struct snd_pcm_substream *substream) return ret; } -static struct snd_pcm_ops snd_dbri_ops = { +static const struct snd_pcm_ops snd_dbri_ops = { .open = snd_dbri_open, .close = snd_dbri_close, .ioctl = snd_pcm_lib_ioctl, |