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 /drivers/mfd/max77686.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 'drivers/mfd/max77686.c')
| -rw-r--r-- | drivers/mfd/max77686.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c index 9f5004d..ac95523 100644 --- a/drivers/mfd/max77686.c +++ b/drivers/mfd/max77686.c @@ -394,7 +394,11 @@ static int __init max77686_i2c_init(void) return i2c_add_driver(&max77686_i2c_driver); } /* init early so consumer devices can complete system boot */ +#ifdef CONFIG_FAST_RESUME +beforeresume_initcall(max77686_i2c_init); +#else subsys_initcall(max77686_i2c_init); +#endif static void __exit max77686_i2c_exit(void) { |