diff --git a/[refs] b/[refs]
index ee57d3bd9276..e5bd4566f786 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e1a7ff8a0a7b948f2684930166954f9e8e776fe
+refs/heads/master: 0835da67c11e879ed5dc23160934d8970470a2ce
diff --git a/trunk/block/elevator.c b/trunk/block/elevator.c
index 269615e6dbf5..8e3fc3afc77b 100644
--- a/trunk/block/elevator.c
+++ b/trunk/block/elevator.c
@@ -34,8 +34,7 @@
 #include <linux/delay.h>
 #include <linux/blktrace_api.h>
 #include <linux/hash.h>
-
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 static DEFINE_SPINLOCK(elv_list_lock);
 static LIST_HEAD(elv_list);