diff options
| author | Coywolf Qi Hunt <qiyong@fc-cn.com> | 2005-12-28 04:55:49 -0500 |
|---|---|---|
| committer | Jens Axboe <axboe@nelson.home.kernel.dk> | 2006-01-09 08:44:15 -0500 |
| commit | 769db45b73896a88d6b40e3e648dfc50a155ec93 (patch) | |
| tree | 773ffec86ddf1ab3ddaf1de5959ec3b94807e395 /include/linux | |
| parent | 1abee6d2d1b6366df96fce1d43eefd1819e1b055 (diff) | |
make elv_try_merge() static, kill the dead declaration of
elv_try_last_merge().
Signed-off-by: Coywolf Qi Hunt <qiyong@fc-cn.com>
Signed-off-by: Jens Axboe <axboe@suse.de>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/elevator.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/elevator.h b/include/linux/elevator.h index fb80fa44c4dd..4a6f50e31c73 100644 --- a/include/linux/elevator.h +++ b/include/linux/elevator.h | |||
| @@ -114,8 +114,6 @@ extern ssize_t elv_iosched_store(request_queue_t *, const char *, size_t); | |||
| 114 | extern int elevator_init(request_queue_t *, char *); | 114 | extern int elevator_init(request_queue_t *, char *); |
| 115 | extern void elevator_exit(elevator_t *); | 115 | extern void elevator_exit(elevator_t *); |
| 116 | extern int elv_rq_merge_ok(struct request *, struct bio *); | 116 | extern int elv_rq_merge_ok(struct request *, struct bio *); |
| 117 | extern int elv_try_merge(struct request *, struct bio *); | ||
| 118 | extern int elv_try_last_merge(request_queue_t *, struct bio *); | ||
| 119 | 117 | ||
| 120 | /* | 118 | /* |
| 121 | * Return values from elevator merger | 119 | * Return values from elevator merger |