Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'

[u-boot] / drivers / power / pmic / pmic_pfuze100.c

diff --git a/drivers/power/pmic/pmic_pfuze100.c b/drivers/power/pmic/pmic_pfuze100.c
index 22c1f15eeb4008acc93546efaff26815d050136a..21f12d2564ee00e1eb11885d3167e995a03e233b 100644 (file)
--- a/drivers/power/pmic/pmic_pfuze100.c
+++ b/drivers/power/pmic/pmic_pfuze100.c
@@ -11,7 +11,7 @@
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 
-int pmic_init(unsigned char bus)
+int power_pfuze100_init(unsigned char bus)
 {
        static const char name[] = "PFUZE100_PMIC";
        struct pmic *p = pmic_alloc();