diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-01-21 15:27:28 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-01-21 15:27:28 +0100 |
| commit | 6250b9ced23032789ca9739d6a53949637f9c836 (patch) | |
| tree | 62379e6b563b45331f8d5d788e8ba7089b2fbaba /sound/drivers/vx | |
| parent | Merge remote branch 'alsa/devel' into topic/misc (diff) | |
| parent | ALSA: pcm - Call pgprot_noncached() for vmalloc'ed buffers (diff) | |
| download | linux-6250b9ced23032789ca9739d6a53949637f9c836.tar.xz linux-6250b9ced23032789ca9739d6a53949637f9c836.zip | |
Merge branch 'topic/noncached-mmap' into topic/misc
Diffstat (limited to 'sound/drivers/vx')
| -rw-r--r-- | sound/drivers/vx/vx_pcm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/drivers/vx/vx_pcm.c b/sound/drivers/vx/vx_pcm.c index c8385d26a16f..35a2f71a6af5 100644 --- a/sound/drivers/vx/vx_pcm.c +++ b/sound/drivers/vx/vx_pcm.c @@ -905,6 +905,7 @@ static struct snd_pcm_ops vx_pcm_playback_ops = { .trigger = vx_pcm_trigger, .pointer = vx_pcm_playback_pointer, .page = snd_pcm_lib_get_vmalloc_page, + .mmap = snd_pcm_lib_mmap_vmalloc, }; @@ -1125,6 +1126,7 @@ static struct snd_pcm_ops vx_pcm_capture_ops = { .trigger = vx_pcm_trigger, .pointer = vx_pcm_capture_pointer, .page = snd_pcm_lib_get_vmalloc_page, + .mmap = snd_pcm_lib_mmap_vmalloc, }; |