aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx3/mach-mx31moboard.c
diff options
context:
space:
mode:
authorYong Shen <yong.shen@linaro.org>2010-12-14 01:00:53 -0500
committerLiam Girdwood <lrg@slimlogic.co.uk>2011-01-12 09:33:03 -0500
commit57c78e359a35c69eca4c88f107500f74ef7f0acf (patch)
tree1b58bce66db5c9c7a7c9dc2de153f18a53af0dcf /arch/arm/mach-mx3/mach-mx31moboard.c
parenta1e516e3a5552519a01e8a7636569d2d1b68431f (diff)
Change the register name definitions for mc13783
To make mc13783 and mc13892 share code, the register names should be changed to fit the new macro definitions in the comming patch. Signed-off-by: Yong Shen <yong.shen@linaro.org> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Samuel Ortiz <sameo@linux.intel.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'arch/arm/mach-mx3/mach-mx31moboard.c')
-rw-r--r--arch/arm/mach-mx3/mach-mx31moboard.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mx3/mach-mx31moboard.c b/arch/arm/mach-mx3/mach-mx31moboard.c
index 203d21a510aa..1aa8d65fccbb 100644
--- a/arch/arm/mach-mx3/mach-mx31moboard.c
+++ b/arch/arm/mach-mx3/mach-mx31moboard.c
@@ -216,11 +216,11 @@ static struct regulator_init_data cam_vreg_data = {
216 216
217static struct mc13783_regulator_init_data moboard_regulators[] = { 217static struct mc13783_regulator_init_data moboard_regulators[] = {
218 { 218 {
219 .id = MC13783_REGU_VMMC1, 219 .id = MC13783_REG_VMMC1,
220 .init_data = &sdhc_vreg_data, 220 .init_data = &sdhc_vreg_data,
221 }, 221 },
222 { 222 {
223 .id = MC13783_REGU_VCAM, 223 .id = MC13783_REG_VCAM,
224 .init_data = &cam_vreg_data, 224 .init_data = &cam_vreg_data,
225 }, 225 },
226}; 226};