Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

[karo-tx-linux.git] / block / noop-iosched.c

diff --git a/block/noop-iosched.c b/block/noop-iosched.c
index 79af431794213867e5ac1c457103d62b0d74cb43..1c3de2b9a6b59c0d6938b082bfb48fa6085d877d 100644 (file)
--- a/block/noop-iosched.c
+++ b/block/noop-iosched.c
@@ -65,7 +65,7 @@ noop_latter_request(request_queue_t *q, struct request *rq)
        return list_entry(rq->queuelist.next, struct request, queuelist);
 }
 
-static void *noop_init_queue(request_queue_t *q, elevator_t *e)
+static void *noop_init_queue(request_queue_t *q)
 {
        struct noop_data *nd;