Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

[sfrench/cifs-2.6.git] / block / noop-iosched.c

diff --git a/block/noop-iosched.c b/block/noop-iosched.c
index c23e029696508dde4161e1359acd882a6dc8a6de..3a0d369d08c7488f8f475091ef3ee6b5dfe46211 100644 (file)
--- a/block/noop-iosched.c
+++ b/block/noop-iosched.c
@@ -76,7 +76,7 @@ static void *noop_init_queue(struct request_queue *q)
        return nd;
 }
 
-static void noop_exit_queue(elevator_t *e)
+static void noop_exit_queue(struct elevator_queue *e)
 {
        struct noop_data *nd = e->elevator_data;