diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-08-12 08:55:01 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-08-12 08:55:10 +0200 |
| commit | 73b383141d296c55bfbc0ce336a4a946627e7780 (patch) | |
| tree | df0840c4ea4bbd5aa453931a594936bd9adab61d /sound/usb/hiface/pcm.c | |
| parent | 627661ced8246c8e833f3bc3817070e934cd79ba (diff) | |
| parent | 91c6e15efc1756b068dc6e945c1626397e60a119 (diff) | |
| download | linux-73b383141d296c55bfbc0ce336a4a946627e7780.tar.bz2 | |
Merge branch 'for-next' into for-linus
Preparation for 4.19 merge material.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/hiface/pcm.c')
| -rw-r--r-- | sound/usb/hiface/pcm.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/usb/hiface/pcm.c b/sound/usb/hiface/pcm.c index 396c317115b1..e1fbb9cc9ea7 100644 --- a/sound/usb/hiface/pcm.c +++ b/sound/usb/hiface/pcm.c @@ -523,7 +523,6 @@ static const struct snd_pcm_ops pcm_ops = { .trigger = hiface_pcm_trigger, .pointer = hiface_pcm_pointer, .page = snd_pcm_lib_get_vmalloc_page, - .mmap = snd_pcm_lib_mmap_vmalloc, }; static int hiface_pcm_init_urb(struct pcm_urb *urb, |