diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-12-15 21:36:09 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-12-15 21:36:09 -0800 |
| commit | ebfb0184ef560897fad35005989e82433419202c (patch) | |
| tree | 226a8195fdae6c79d90d76baa1cbdaf80f794bb0 /drivers/media/pci/ivtv/ivtv-alsa-pcm.c | |
| parent | Input: imx6ul_tsc - generalize the averaging property (diff) | |
| parent | Input: synaptics-rmi4 - add support for F34 V7 bootloader (diff) | |
| download | linux-dev-ebfb0184ef560897fad35005989e82433419202c.tar.xz linux-dev-ebfb0184ef560897fad35005989e82433419202c.zip | |
Merge branch 'synaptics-rmi4' into next
Merge updated Synaptics RMI4 support, including support for SMBus
controllers and flashing firmware.
Diffstat (limited to 'drivers/media/pci/ivtv/ivtv-alsa-pcm.c')
| -rw-r--r-- | drivers/media/pci/ivtv/ivtv-alsa-pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/ivtv/ivtv-alsa-pcm.c b/drivers/media/pci/ivtv/ivtv-alsa-pcm.c index f198b9826ed8..a26f9800eca3 100644 --- a/drivers/media/pci/ivtv/ivtv-alsa-pcm.c +++ b/drivers/media/pci/ivtv/ivtv-alsa-pcm.c @@ -318,7 +318,7 @@ static struct page *snd_pcm_get_vmalloc_page(struct snd_pcm_substream *subs, return vmalloc_to_page(pageptr); } -static struct snd_pcm_ops snd_ivtv_pcm_capture_ops = { +static const struct snd_pcm_ops snd_ivtv_pcm_capture_ops = { .open = snd_ivtv_pcm_capture_open, .close = snd_ivtv_pcm_capture_close, .ioctl = snd_ivtv_pcm_ioctl, |