Merge remote-tracking branch 'regulator/topic/arizona' into v3.9-rc8

f50b7f2b · Mark Brown · c98cac89 · ce1bcb7e · f50b7f2b
Commit f50b7f2b authored Apr 28, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/regulator/arizona-ldo1.c drivers/regulator/arizona-ldo1.c +1 -1

No files found.
--- a/drivers/regulator/arizona-ldo1.c
+++ b/drivers/regulator/arizona-ldo1.c
@@ -131,7 +131,7 @@ static const struct regulator_desc arizona_ldo1_hc = {
 	.min_uV = 900000,
 	.uV_step = 50000,
 	.n_voltages = 8,
-	.enable_time = 500,
+	.enable_time = 1500,

 	.owner = THIS_MODULE,
 };