diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-18 11:04:24 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-18 11:04:24 -0500 |
| commit | 3c615e19a4c518e349cc81a7f43223c7ec5f9e9a (patch) | |
| tree | 45326cb0f8b8b67d2e8123151e5c8c34d28b1587 /include/linux | |
| parent | 57680915a6f2324c008b6213fe12b74507b3fcd0 (diff) | |
| parent | 458cf5e9b666c251b04cb5242fb19fd5114645ba (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
Cleanup umem driver: fix most checkpatch warnings, conform to kernel
block: let elv_register() return void
as-iosched: fix write batch start point
as-iosched: fix incorrect comments
block: use jiffies conversion functions in scsi_ioctl.c
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/elevator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/elevator.h b/include/linux/elevator.h index e8f42133a616..639624b55fbe 100644 --- a/include/linux/elevator.h +++ b/include/linux/elevator.h | |||
| @@ -119,7 +119,7 @@ extern void elv_put_request(struct request_queue *, struct request *); | |||
| 119 | /* | 119 | /* |
| 120 | * io scheduler registration | 120 | * io scheduler registration |
| 121 | */ | 121 | */ |
| 122 | extern int elv_register(struct elevator_type *); | 122 | extern void elv_register(struct elevator_type *); |
| 123 | extern void elv_unregister(struct elevator_type *); | 123 | extern void elv_unregister(struct elevator_type *); |
| 124 | 124 | ||
| 125 | /* | 125 | /* |