From 7e5f484d632f9482f643f70e77e9a364a1720333 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Fri, 7 Jan 2011 17:07:22 +0100
Subject: [PATCH] --- yaml --- r: 231359 b: refs/heads/master c:
 074cee9257b96a84c955ee2a2816d426c9f64e52 h: refs/heads/master i:   231357:
 e0da0915a6abe3f04d6c8a2294987206b3305b5d   231355:
 7865a05e56b8a36b15971cd4f4bc0d114f50dc5f   231351:
 b5074844beefd262f1892a2a7bbff51f8d2e502a   231343:
 cc8f0901767e4f56e725656d4f5006bc07c09611   231327:
 a3bfe33d409ae54f597f1ff27a11ef7af35c4369   231295:
 8f669a0f2f40b4d8c532cd5d90a47a17c6f32508 v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/arm/mach-imx/mach-mx27_3ds.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b7e9b5aed1ef..9bcc51d3436b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 410d3458e56bfe85ea4ac6358d5ae16d2f9acda6
+refs/heads/master: 074cee9257b96a84c955ee2a2816d426c9f64e52
diff --git a/trunk/arch/arm/mach-imx/mach-mx27_3ds.c b/trunk/arch/arm/mach-imx/mach-mx27_3ds.c
index 6fd0f8f6deb6..83f8e2b4fd5c 100644
--- a/trunk/arch/arm/mach-imx/mach-mx27_3ds.c
+++ b/trunk/arch/arm/mach-imx/mach-mx27_3ds.c
@@ -215,10 +215,10 @@ static struct regulator_init_data vgen_init = {
 
 static struct mc13783_regulator_init_data mx27_3ds_regulators[] = {
 	{
-		.id = MC13783_REGU_VMMC1,
+		.id = MC13783_REG_VMMC1,
 		.init_data = &vmmc1_init,
 	}, {
-		.id = MC13783_REGU_VGEN,
+		.id = MC13783_REG_VGEN,
 		.init_data = &vgen_init,
 	},
 };