Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / block / elevator.c

diff --git a/block/elevator.c b/block/elevator.c
index e5677fe4f4128a2ca0949eca672404a1b1377a4e..86836dd179c05476078719869a0481777e999bc1 100644 (file)
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -850,14 +850,7 @@ void elv_dequeue_request(struct request_queue *q, struct request *rq)
         */
        if (blk_account_rq(rq))
                q->in_flight++;
-
-       /*
-        * We are now handing the request to the hardware, add the
-        * timeout handler.
-        */
-       blk_add_timer(rq);
 }
-EXPORT_SYMBOL(elv_dequeue_request);
 
 int elv_queue_empty(struct request_queue *q)
 {