diff --git a/[refs] b/[refs]
index 31aab6384990..ac9ba8a370cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cfde74517b32724a78896eda49198f147e12050d
+refs/heads/master: 07d2a2823014927e3578377a07868400837a79c6
diff --git a/trunk/drivers/staging/me4000/me4000.c b/trunk/drivers/staging/me4000/me4000.c
index e1c4a8078901..dbe93f9a18c0 100644
--- a/trunk/drivers/staging/me4000/me4000.c
+++ b/trunk/drivers/staging/me4000/me4000.c
@@ -36,8 +36,8 @@
 #include <linux/vmalloc.h>
 #include <linux/slab.h>
 #include <asm/pgtable.h>
-#include <asm/uaccess.h>
-#include <asm/io.h>
+#include <linux/uaccess.h>
+#include <linux/io.h>
 #include <asm/system.h>
 
 /* Include-File for the Meilhaus ME-4000 I/O board */