From: Axel Lin Date: Mon, 25 Mar 2013 06:53:50 +0000 (+0800) Subject: regulator: ab8500: Fix build error X-Git-Tag: firefly_0821_release~3680^2~668^2~25^2~69 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=328a5369664d09e9082a8e814a9b2dcdfb7f519b;p=firefly-linux-kernel-4.4.55.git regulator: ab8500: Fix build error Fix below build error: CC drivers/regulator/ab8500.o drivers/regulator/ab8500.c:500:23: error: 'ab8500_regulator_fixed_ops' undeclared here (not in a function) drivers/regulator/ab8500.c: In function 'ab8500_regulator_probe': drivers/regulator/ab8500.c:972:8: warning: assignment from incompatible pointer type [enabled by default] make[2]: *** [drivers/regulator/ab8500.o] Error 1 make[1]: *** [drivers/regulator] Error 2 make: *** [drivers] Error 2 Signed-off-by: Axel Lin Acked-by: Lee Jones Signed-off-by: Mark Brown --- diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index f7d1f538c200..a2d19c650f24 100644 --- a/drivers/regulator/ab8500.c +++ b/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",