summaryrefslogtreecommitdiffstats
path: root/sound/oss/dmabuf.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-12-04 19:37:06 +0100
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-04 19:37:06 +0100
commit9b8ab9f6c37c610feea20edfb357a3b8a43d39bd (patch)
tree02d18c920a03a600e915d66d6a471d900857b3ac /sound/oss/dmabuf.c
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parent[PATCH] severing poll.h -> mm.h (diff)
downloadlinux-9b8ab9f6c37c610feea20edfb357a3b8a43d39bd.tar.xz
linux-9b8ab9f6c37c610feea20edfb357a3b8a43d39bd.zip
Merge branch 'for-linus4' of master.kernel.org:/pub/scm/linux/kernel/git/viro/bird
* 'for-linus4' of master.kernel.org:/pub/scm/linux/kernel/git/viro/bird: [PATCH] severing poll.h -> mm.h [PATCH] severing skbuff.h -> mm.h [PATCH] severing skbuff.h -> poll.h [PATCH] severing skbuff.h -> highmem.h [PATCH] severing uaccess.h -> sched.h [PATCH] severing fs.h, radix-tree.h -> sched.h [PATCH] severing module.h->sched.h
Diffstat (limited to 'sound/oss/dmabuf.c')
-rw-r--r--sound/oss/dmabuf.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/oss/dmabuf.c b/sound/oss/dmabuf.c
index b256c0401161..eaf69971bf92 100644
--- a/sound/oss/dmabuf.c
+++ b/sound/oss/dmabuf.c
@@ -25,6 +25,7 @@
#define BE_CONSERVATIVE
#define SAMPLE_ROUNDUP 0
+#include <linux/mm.h>
#include "sound_config.h"
#define DMAP_FREE_ON_CLOSE 0