diff options
author | Mark Brown | 2013-04-28 02:13:35 +0100 |
---|---|---|
committer | Mark Brown | 2013-04-28 02:13:35 +0100 |
commit | f50b7f2b5120a93cb4b5725fa1ad863641d3923c (patch) | |
tree | 241c9deb167df660d5e20a2775a22282457b5751 | |
parent | c98cac899b6cd8ce5908c1d87708d78b41f6472d (diff) | |
parent | ce1bcb7eabd1c6f6679b5d4a3fa3313c8da90715 (diff) |
Merge remote-tracking branch 'regulator/topic/arizona' into v3.9-rc8
-rw-r--r-- | drivers/regulator/arizona-ldo1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/arizona-ldo1.c b/drivers/regulator/arizona-ldo1.c index ed7beec53af8..81d8681c3195 100644 --- 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, }; |