quota: drop remount argument to ->quota_on and ->quota_off

[safe/jmp/linux-2.6] / block / noop-iosched.c

diff --git a/block/noop-iosched.c b/block/noop-iosched.c
index 7563d8a..232c4b3 100644 (file)
--- a/block/noop-iosched.c
+++ b/block/noop-iosched.c
@@ -5,6 +5,7 @@
 #include <linux/elevator.h>
 #include <linux/bio.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/init.h>
 
 struct noop_data {
@@ -76,7 +77,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;
 
@@ -101,7 +102,9 @@ static struct elevator_type elevator_noop = {
 
 static int __init noop_init(void)
 {
-       return elv_register(&elevator_noop);
+       elv_register(&elevator_noop);
+
+       return 0;
 }
 
 static void __exit noop_exit(void)