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
This commit is contained in:
@@ -119,7 +119,7 @@ extern void elv_put_request(struct request_queue *, struct request *);
|
||||
/*
|
||||
* io scheduler registration
|
||||
*/
|
||||
extern int elv_register(struct elevator_type *);
|
||||
extern void elv_register(struct elevator_type *);
|
||||
extern void elv_unregister(struct elevator_type *);
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user