From 7a34e230ff4888ec2a2bca79cb803375c43884b1 Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Tue, 26 Aug 2008 09:15:47 +0200
Subject: [PATCH] --- yaml --- r: 110495 b: refs/heads/master c:
 0835da67c11e879ed5dc23160934d8970470a2ce h: refs/heads/master i:   110493:
 c38dce7b48eb770b68eeec99a75a52df8e1d8e31   110491:
 703c8c1b43725c88ee5910c0d44813957702d78e   110487:
 4b2373c6b68ee77fa912887f74aba44fde2cf3a7   110479:
 e25887a7b530612e2cc6601188f025a77571861e   110463:
 f3d548a7627b80a2951223896477d601185589da v: v3

---
 [refs]                 | 2 +-
 trunk/block/elevator.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

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);