diff options
author | Philipp Zabel <philipp.zabel@gmail.com> | 2009-01-18 08:32:27 -0500 |
---|---|---|
committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2009-01-30 16:50:49 -0500 |
commit | 9bf503e6bec3f2d28298808454eebde031ab5b5b (patch) | |
tree | 59d6093f555b3fca979662ea68e62a8bbb9c3d4a | |
parent | 33bfad54b58cf05cfe6678c3ec9235d4bc8db4c2 (diff) |
regulator: move bq24022 init back to module_init instead of subsys_initcall
This workaround was needed when regulator/ was not linked before both
power/ and usb/otg/ in drivers/Makefile. Now that it is even linked
before mfd/, this patch makes sure that bq24022 isn't probed before the
GPIO expander is set up.
Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
-rw-r--r-- | drivers/regulator/bq24022.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/regulator/bq24022.c b/drivers/regulator/bq24022.c index 366565aba865..c175e38a4cd5 100644 --- a/drivers/regulator/bq24022.c +++ b/drivers/regulator/bq24022.c | |||
@@ -152,11 +152,7 @@ static void __exit bq24022_exit(void) | |||
152 | platform_driver_unregister(&bq24022_driver); | 152 | platform_driver_unregister(&bq24022_driver); |
153 | } | 153 | } |
154 | 154 | ||
155 | /* | 155 | module_init(bq24022_init); |
156 | * make sure this is probed before gpio_vbus and pda_power, | ||
157 | * but after asic3 or other GPIO expander drivers. | ||
158 | */ | ||
159 | subsys_initcall(bq24022_init); | ||
160 | module_exit(bq24022_exit); | 156 | module_exit(bq24022_exit); |
161 | 157 | ||
162 | MODULE_AUTHOR("Philipp Zabel"); | 158 | MODULE_AUTHOR("Philipp Zabel"); |