aboutsummaryrefslogtreecommitdiffstats
path: root/block/genhd.c
diff options
context:
space:
mode:
authorcodeworkx <codeworkx@cyanogenmod.com>2012-09-22 09:48:20 +0200
committercodeworkx <codeworkx@cyanogenmod.com>2012-09-22 14:02:16 +0200
commit2489007e7d740ccbc3e0a202914e243ad5178787 (patch)
treeb8e6380ea7b1da63474ad68a5dba997e01146043 /block/genhd.c
parent5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff)
downloadkernel_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/genhd.c')
-rw-r--r--block/genhd.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/block/genhd.c b/block/genhd.c
index b301fad..de7fc3e 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -916,7 +916,11 @@ static int __init genhd_device_init(void)
return 0;
}
+#ifdef CONFIG_FAST_RESUME
+beforeresume_initcall(genhd_device_init);
+#else
subsys_initcall(genhd_device_init);
+#endif
static ssize_t disk_range_show(struct device *dev,
struct device_attribute *attr, char *buf)