From 36df8546d2b70ccc9c7a8a6a8959507cd8ff4b3d Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Mon, 25 Mar 2013 14:53:50 +0800 Subject: [PATCH] --- yaml --- r: 365034 b: refs/heads/master c: 328a5369664d09e9082a8e814a9b2dcdfb7f519b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/regulator/ab8500.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index e2535d20cd96..a25732f59311 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 732805a563617aafc7405409c03182afafb3943b +refs/heads/master: 328a5369664d09e9082a8e814a9b2dcdfb7f519b diff --git a/trunk/drivers/regulator/ab8500.c b/trunk/drivers/regulator/ab8500.c index f7d1f538c200..a2d19c650f24 100644 --- a/trunk/drivers/regulator/ab8500.c +++ b/trunk/drivers/regulator/ab8500.c @@ -494,10 +494,14 @@ static struct ab8500_regulator_info .update_val_idle = 0x82, .update_val_normal = 0x02, }, + + /* + * Regulators with fixed voltage and normal mode + */ [AB8500_LDO_USB] = { .desc = { .name = "LDO-USB", - .ops = &ab8500_regulator_fixed_ops, + .ops = &ab8500_regulator_ops, .type = REGULATOR_VOLTAGE, .id = AB8500_LDO_USB, .owner = THIS_MODULE, @@ -508,10 +512,6 @@ static struct ab8500_regulator_info .update_reg = 0x82, .update_mask = 0x03, }, - - /* - * Regulators with fixed voltage and normal mode - */ [AB8500_LDO_AUDIO] = { .desc = { .name = "LDO-AUDIO",