Merge master.kernel.org:/home/rmk/linux-2.6-arm

[~andy/linux] / sound / oss / sscape.c

diff --git a/sound/oss/sscape.c b/sound/oss/sscape.c
index 51f2fa615413af605e314edf071263f534585473..30c36d1f35d7a9641428ebb8b91bc5d02586cf28 100644 (file)
--- a/sound/oss/sscape.c
+++ b/sound/oss/sscape.c
@@ -39,6 +39,7 @@
 #include <linux/ioport.h>
 #include <linux/delay.h>
 #include <linux/proc_fs.h>
+#include <linux/mm.h>
 #include <linux/spinlock.h>
 
 #include "coproc.h"