aboutsummaryrefslogtreecommitdiffstats
path: root/sound/mips/sgio2audio.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-01-21 15:27:28 +0100
committerTakashi Iwai <tiwai@suse.de>2010-01-21 15:27:28 +0100
commit6250b9ced23032789ca9739d6a53949637f9c836 (patch)
tree62379e6b563b45331f8d5d788e8ba7089b2fbaba /sound/mips/sgio2audio.c
parent8b296c8f9f660b70e958e6e6b9b4293e6ae854f2 (diff)
parentc32d977b8157bf67cdf47729ce7dd054a26eb534 (diff)
downloadkernel_goldelico_gta04-6250b9ced23032789ca9739d6a53949637f9c836.zip
kernel_goldelico_gta04-6250b9ced23032789ca9739d6a53949637f9c836.tar.gz
kernel_goldelico_gta04-6250b9ced23032789ca9739d6a53949637f9c836.tar.bz2
Merge branch 'topic/noncached-mmap' into topic/misc
Diffstat (limited to 'sound/mips/sgio2audio.c')
-rw-r--r--sound/mips/sgio2audio.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/mips/sgio2audio.c b/sound/mips/sgio2audio.c
index 9b486be..6aff217 100644
--- a/sound/mips/sgio2audio.c
+++ b/sound/mips/sgio2audio.c
@@ -691,6 +691,7 @@ static struct snd_pcm_ops snd_sgio2audio_playback1_ops = {
.trigger = snd_sgio2audio_pcm_trigger,
.pointer = snd_sgio2audio_pcm_pointer,
.page = snd_pcm_lib_get_vmalloc_page,
+ .mmap = snd_pcm_lib_mmap_vmalloc,
};
static struct snd_pcm_ops snd_sgio2audio_playback2_ops = {
@@ -703,6 +704,7 @@ static struct snd_pcm_ops snd_sgio2audio_playback2_ops = {
.trigger = snd_sgio2audio_pcm_trigger,
.pointer = snd_sgio2audio_pcm_pointer,
.page = snd_pcm_lib_get_vmalloc_page,
+ .mmap = snd_pcm_lib_mmap_vmalloc,
};
static struct snd_pcm_ops snd_sgio2audio_capture_ops = {
@@ -715,6 +717,7 @@ static struct snd_pcm_ops snd_sgio2audio_capture_ops = {
.trigger = snd_sgio2audio_pcm_trigger,
.pointer = snd_sgio2audio_pcm_pointer,
.page = snd_pcm_lib_get_vmalloc_page,
+ .mmap = snd_pcm_lib_mmap_vmalloc,
};
/*