regulator: ab8500: Fix build error
authorAxel Lin <axel.lin@ingics.com>
Mon, 25 Mar 2013 06:53:50 +0000 (14:53 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 25 Mar 2013 10:19:43 +0000 (10:19 +0000)
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 <axel.lin@ingics.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
drivers/regulator/ab8500.c

index f7d1f538c200c649b068eb24af7ae00b009b4295..a2d19c650f2470dc7dfaedb67b35c881d187e43c 100644 (file)
@@ -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",