Merge remote-tracking branches 'regulator/fix/isl9305', 'regulator/fix/rk808' and...

[sfrench/cifs-2.6.git] / drivers / regulator / rk808-regulator.c

diff --git a/drivers/regulator/rk808-regulator.c b/drivers/regulator/rk808-regulator.c
index fb44d5215e30c8573b8eef9ad751367ef4e23e81..a16d81420612e485e2a96e1fe679d3c3b13d7d31 100644 (file)
--- a/drivers/regulator/rk808-regulator.c
+++ b/drivers/regulator/rk808-regulator.c
@@ -519,7 +519,7 @@ static const struct regulator_desc rk818_reg[] = {
                RK818_LDO1_ON_VSEL_REG, RK818_LDO_VSEL_MASK, RK818_LDO_EN_REG,
                BIT(0), 400),
        RK8XX_DESC(RK818_ID_LDO2, "LDO_REG2", "vcc6", 1800, 3400, 100,
-               RK818_LDO1_ON_VSEL_REG, RK818_LDO_VSEL_MASK, RK818_LDO_EN_REG,
+               RK818_LDO2_ON_VSEL_REG, RK818_LDO_VSEL_MASK, RK818_LDO_EN_REG,
                BIT(1), 400),
        {
                .name = "LDO_REG3",