ARM: 6906/1: MTD: Remove integrator-flash

[~andy/linux] / block / elevator.c

diff --git a/block/elevator.c b/block/elevator.c
index 6f6abc08bb565e61d63294e1a14f66ac6cda6a3d..45ca1e34f58249ff5b3838c0ec89fbc1c6ea2bb7 100644 (file)
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -671,7 +671,8 @@ void __elv_add_request(struct request_queue *q, struct request *rq, int where)
                        q->boundary_rq = rq;
                }
        } else if (!(rq->cmd_flags & REQ_ELVPRIV) &&
-                   where == ELEVATOR_INSERT_SORT)
+                   (where == ELEVATOR_INSERT_SORT ||
+                    where == ELEVATOR_INSERT_SORT_MERGE))
                where = ELEVATOR_INSERT_BACK;
 
        switch (where) {