diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-09 08:58:11 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-09 08:58:11 -0500 |
commit | 249d51b53aea1b7cdb1be65a1a9a0c59d9e06f3e (patch) | |
tree | 7fc06930e46ee13d394f5b031166c40206af3189 /drivers/regulator/bq24022.c | |
parent | 44581a28e805a31661469c4b466b9cd14b36e7b6 (diff) | |
parent | 8e4921515c1a379539607eb443d51c30f4f7f338 (diff) |
Merge commit 'v2.6.29-rc4' into core/percpu
Conflicts:
arch/x86/mach-voyager/voyager_smp.c
arch/x86/mm/fault.c
Diffstat (limited to 'drivers/regulator/bq24022.c')
-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"); |