Merge branch 'for-3.16' of git://linux-nfs.org/~bfields/linux

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

diff --git a/block/elevator.c b/block/elevator.c
index 34bded18910e74f73754b9584361deba40611682..24c28b659bb34f00eae0e4b900266e1dca069169 100644 (file)
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -825,7 +825,7 @@ void elv_unregister_queue(struct request_queue *q)
 }
 EXPORT_SYMBOL(elv_unregister_queue);
 
-int __init elv_register(struct elevator_type *e)
+int elv_register(struct elevator_type *e)
 {
        char *def = "";