commit ed5157e8895a6bf59a8163329639e34db0702331
author Fabio Estevam <fabio.estevam@freescale.com> Mon May 07 10:25:58 2012 +0000
committer Albert ARIBAUD <albert.u.boot@aribaud.net> Tue May 15 08:31:34 2012 +0200
tree d66082c1f28541fd35b8f5e716e8a18c488792a8
parent bff969eaf0f8d6743558607dfbc7a03f3a7a36d2

pmic: dialog: Avoid name conflicts

As mx53loco board has two variants: one with Dialog PMIC and another with FSL MC34708 PMIC,
we need to be able to build both drivers.

Change pmic_init() and PMIC_NUM_OF_REGS names to avoid build conflicts when both drivers are present.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Stefano Babic <sbabic@denx.de>

include/dialog_pmic.h

diff --git a/include/dialog_pmic.h b/include/dialog_pmic.h
index b0925f5..8d43585 100644
--- a/include/dialog_pmic.h
+++ b/include/dialog_pmic.h
@@ -164,7 +164,7 @@
 	DA9053_GPID7_REG,
 	DA9053_GPID8_REG,
 	DA9053_GPID9_REG,
-	PMIC_NUM_OF_REGS,
+	DIALOG_NUM_OF_REGS,
 };
 
 #define DA_BUCKCORE_VBCORE_1_250V		0x1E