diff options
author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 09:48:20 +0200 |
---|---|---|
committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 14:02:16 +0200 |
commit | 2489007e7d740ccbc3e0a202914e243ad5178787 (patch) | |
tree | b8e6380ea7b1da63474ad68a5dba997e01146043 /block/deadline-iosched.c | |
parent | 5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff) | |
download | kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2 |
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'block/deadline-iosched.c')
-rw-r--r-- | block/deadline-iosched.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/block/deadline-iosched.c b/block/deadline-iosched.c index 5139c0e..301a779 100644 --- a/block/deadline-iosched.c +++ b/block/deadline-iosched.c @@ -460,7 +460,11 @@ static void __exit deadline_exit(void) elv_unregister(&iosched_deadline); } +#ifdef CONFIG_FAST_RESUME +beforeresume_initcall(deadline_init); +#else module_init(deadline_init); +#endif module_exit(deadline_exit); MODULE_AUTHOR("Jens Axboe"); |