diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-18 08:04:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-18 08:04:24 -0800 |
| commit | 3c615e19a4c518e349cc81a7f43223c7ec5f9e9a (patch) | |
| tree | 45326cb0f8b8b67d2e8123151e5c8c34d28b1587 /block/noop-iosched.c | |
| parent | Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6 (diff) | |
| parent | Cleanup umem driver: fix most checkpatch warnings, conform to kernel (diff) | |
| download | linux-dev-3c615e19a4c518e349cc81a7f43223c7ec5f9e9a.tar.xz linux-dev-3c615e19a4c518e349cc81a7f43223c7ec5f9e9a.zip | |
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 'block/noop-iosched.c')
| -rw-r--r-- | block/noop-iosched.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/block/noop-iosched.c b/block/noop-iosched.c index 7563d8aa3944..c23e02969650 100644 --- a/block/noop-iosched.c +++ b/block/noop-iosched.c @@ -101,7 +101,9 @@ static struct elevator_type elevator_noop = { static int __init noop_init(void) { - return elv_register(&elevator_noop); + elv_register(&elevator_noop); + + return 0; } static void __exit noop_exit(void) |