diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-21 12:21:08 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-21 12:21:08 +0100 |
| commit | c2a7dcad9f0d92d7a96e735abb8bec7b9c621536 (patch) | |
| tree | bf9b20fdd5ab07e5b0e4e0b95c6a3dbab1005cb9 /block/elevator.c | |
| parent | [POWERPC] Make non-PCI build work again (diff) | |
| parent | Linux 2.6.24-rc6 (diff) | |
| download | linux-c2a7dcad9f0d92d7a96e735abb8bec7b9c621536.tar.xz linux-c2a7dcad9f0d92d7a96e735abb8bec7b9c621536.zip | |
Merge branch 'linux-2.6'
Diffstat (limited to 'block/elevator.c')
| -rw-r--r-- | block/elevator.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/block/elevator.c b/block/elevator.c index 446aea2a3cfb..e452deb80395 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -960,7 +960,7 @@ void elv_unregister_queue(struct request_queue *q) __elv_unregister_queue(q->elevator); } -int elv_register(struct elevator_type *e) +void elv_register(struct elevator_type *e) { char *def = ""; @@ -975,7 +975,6 @@ int elv_register(struct elevator_type *e) def = " (default)"; printk(KERN_INFO "io scheduler %s registered%s\n", e->elevator_name, def); - return 0; } EXPORT_SYMBOL_GPL(elv_register); |