From: Axel Lin Date: Tue, 10 May 2011 11:10:36 +0000 (+0800) Subject: Revert "regulator: Move VCOINCELL to be the last element of mc13892_regulators array" X-Git-Tag: upstream/snapshot3+hdmi~10057^2~21 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=327e15af15248563c896c16adad6fc6e04bb5a4d;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Revert "regulator: Move VCOINCELL to be the last element of mc13892_regulators array" I check this patch again and found this actually is not a bug because MC13xxx_DEFINE explictly defines the order of each entry in the array. Thus revert the patch. Signed-off-by: Axel Lin Acked-by: Mark Brown Signed-off-by: Liam Girdwood --- diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c index c1ed67e..33d43b2 100644 --- a/drivers/regulator/mc13892-regulator.c +++ b/drivers/regulator/mc13892-regulator.c @@ -259,6 +259,7 @@ static struct regulator_ops mc13892_sw_regulator_ops; mc13xxx_regulator_ops) static struct mc13xxx_regulator mc13892_regulators[] = { + MC13892_DEFINE_REGU(VCOINCELL, POWERCTL0, POWERCTL0, mc13892_vcoincell), MC13892_SW_DEFINE(SW1, SWITCHERS0, SWITCHERS0, mc13892_sw1), MC13892_SW_DEFINE(SW2, SWITCHERS1, SWITCHERS1, mc13892_sw), MC13892_SW_DEFINE(SW3, SWITCHERS2, SWITCHERS2, mc13892_sw), @@ -292,7 +293,6 @@ static struct mc13xxx_regulator mc13892_regulators[] = { MC13892_GPO_DEFINE(GPO4, POWERMISC, mc13892_gpo), MC13892_GPO_DEFINE(PWGT1SPI, POWERMISC, mc13892_pwgtdrv), MC13892_GPO_DEFINE(PWGT2SPI, POWERMISC, mc13892_pwgtdrv), - MC13892_DEFINE_REGU(VCOINCELL, POWERCTL0, POWERCTL0, mc13892_vcoincell), }; static int mc13892_powermisc_rmw(struct mc13xxx_regulator_priv *priv, u32 mask,