Merge commit 'v2.6.30' into for-2.6.31

[safe/jmp/linux-2.6] / sound / core / memory.c

diff --git a/sound/core/memory.c b/sound/core/memory.c
index 25b0f05..1161158 100644 (file)
--- a/sound/core/memory.c
+++ b/sound/core/memory.c
@@ -20,9 +20,9 @@
  *
  */
 
-#include <linux/module.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
+#include <sound/core.h>
 
 /**
  * copy_to_user_fromio - copy data from mmio-space to user-space