From 91384f3339d688805184ff35ab287c17b13fbc71 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 27 Jun 2012 15:00:02 +0100
Subject: [PATCH] --- yaml --- r: 312600 b: refs/heads/master c:
 eefaa3c6280f3d523348e1d200e5a8215ed66fbc h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/regulator/wm831x-ldo.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 855d3ae5d022..d33d8996f560 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00581b30ae75ea0813207803e2b1d3f9abc55b9a
+refs/heads/master: eefaa3c6280f3d523348e1d200e5a8215ed66fbc
diff --git a/trunk/drivers/regulator/wm831x-ldo.c b/trunk/drivers/regulator/wm831x-ldo.c
index 04d8a413c260..5cb70ca1e98d 100644
--- a/trunk/drivers/regulator/wm831x-ldo.c
+++ b/trunk/drivers/regulator/wm831x-ldo.c
@@ -701,6 +701,7 @@ static __devinit int wm831x_alive_ldo_probe(struct platform_device *pdev)
 	ldo->desc.enable_mask = 1 << id;
 	ldo->desc.min_uV = 800000;
 	ldo->desc.uV_step = 50000;
+	ldo->desc.enable_time = 1000;
 
 	config.dev = pdev->dev.parent;
 	if (pdata)