diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-03-28 07:03:58 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-03-28 07:03:58 -0400 |
| commit | cdccfc8dc0bf62a1da327324a8d639139acc9279 (patch) | |
| tree | dca7934b27d510c9c006558979ebc48e07a531cf /include/sound | |
| parent | b21a8ee67013372f439fbd1591e91d09de49bb9c (diff) | |
| parent | c6b358748e19ce7e230b0926ac42696bc485a562 (diff) | |
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 | |||
| 1031 | #define snd_pcm_lib_mmap_iomem NULL | 1031 | #define snd_pcm_lib_mmap_iomem NULL |
| 1032 | #endif | 1032 | #endif |
| 1033 | 1033 | ||
| 1034 | int snd_pcm_lib_mmap_noncached(struct snd_pcm_substream *substream, | 1034 | #define snd_pcm_lib_mmap_vmalloc NULL |
| 1035 | struct vm_area_struct *area); | ||
| 1036 | #define snd_pcm_lib_mmap_vmalloc snd_pcm_lib_mmap_noncached | ||
| 1037 | 1035 | ||
| 1038 | static inline void snd_pcm_limit_isa_dma_size(int dma, size_t *max) | 1036 | static inline void snd_pcm_limit_isa_dma_size(int dma, size_t *max) |
| 1039 | { | 1037 | { |