diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-03-28 13:03:58 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-03-28 13:03:58 +0200 |
| commit | cdccfc8dc0bf62a1da327324a8d639139acc9279 (patch) | |
| tree | dca7934b27d510c9c006558979ebc48e07a531cf /include/sound | |
| parent | [media] remove radio-maestro (diff) | |
| parent | ALSA: hda - Fix pin-config of Gigabyte mobo (diff) | |
| download | linux-cdccfc8dc0bf62a1da327324a8d639139acc9279.tar.xz linux-cdccfc8dc0bf62a1da327324a8d639139acc9279.zip | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/pcm.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 430a9cc045e2..e1bad1130616 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -1031,9 +1031,7 @@ int snd_pcm_lib_mmap_iomem(struct snd_pcm_substream *substream, struct vm_area_s #define snd_pcm_lib_mmap_iomem NULL #endif -int snd_pcm_lib_mmap_noncached(struct snd_pcm_substream *substream, - struct vm_area_struct *area); -#define snd_pcm_lib_mmap_vmalloc snd_pcm_lib_mmap_noncached +#define snd_pcm_lib_mmap_vmalloc NULL static inline void snd_pcm_limit_isa_dma_size(int dma, size_t *max) { |