summaryrefslogtreecommitdiff
path: root/drivers/power/pmic/pmic_pfuze100.c
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-05-22 14:29:41 -0400
committerTom Rini <trini@ti.com>2014-05-22 14:29:41 -0400
commitf6ed9d50949eb290744bf7606e30763582e2d44b (patch)
tree659cd954a4b4075c7227ea6d1d6ec768b0a2d78a /drivers/power/pmic/pmic_pfuze100.c
parent8e3812859670fda61b98458864fa9f014fcd3dcc (diff)
parent05d134b084590684bcf4d832c0035952727b7cd9 (diff)
downloadu-boot-imx-f6ed9d50949eb290744bf7606e30763582e2d44b.zip
u-boot-imx-f6ed9d50949eb290744bf7606e30763582e2d44b.tar.gz
u-boot-imx-f6ed9d50949eb290744bf7606e30763582e2d44b.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'drivers/power/pmic/pmic_pfuze100.c')
-rw-r--r--drivers/power/pmic/pmic_pfuze100.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/pmic/pmic_pfuze100.c b/drivers/power/pmic/pmic_pfuze100.c
index 22c1f15..21f12d2 100644
--- 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();