Merge master.kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw

[linux-2.6] / include / sound / pcm.h

diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index afaf3e88e086c8712c7cdf8b4d743e1e3674bd97..2f645dfd7f70c59e64f64ab2ad8ff5a2e8588358 100644 (file)
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -26,6 +26,7 @@
 #include <sound/asound.h>
 #include <sound/memalloc.h>
 #include <linux/poll.h>
+#include <linux/mm.h>
 #include <linux/bitops.h>
 
 #define snd_pcm_substream_chip(substream) ((substream)->private_data)