From a48e9adaadcd1ad42cf2ef25859728ddfe90dd3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
Date: Wed, 24 Aug 2011 15:28:23 +0200
Subject: [PATCH] --- yaml --- r: 273390 b: refs/heads/master c:
 8aece6ab49dbc5646d6339eee424d1f944f54519 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 52cd88e62ab2..4a2eda46f2f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8dd93eeee873d2383dbca4cca1983b6731efdb75
+refs/heads/master: 8aece6ab49dbc5646d6339eee424d1f944f54519
diff --git a/trunk/arch/arm/mach-imx/mach-mx27_3ds.c b/trunk/arch/arm/mach-imx/mach-mx27_3ds.c
index 6fa6934ab150..38568554293a 100644
--- a/trunk/arch/arm/mach-imx/mach-mx27_3ds.c
+++ b/trunk/arch/arm/mach-imx/mach-mx27_3ds.c
@@ -293,8 +293,8 @@ static struct mc13xxx_platform_data mc13783_pdata = {
 		.num_regulators = ARRAY_SIZE(mx27_3ds_regulators),
 
 	},
-	.flags  = MC13783_USE_REGULATOR | MC13783_USE_TOUCHSCREEN |
-	MC13783_USE_RTC,
+	.flags  = MC13XXX_USE_REGULATOR | MC13XXX_USE_TOUCHSCREEN |
+		MC13XXX_USE_RTC,
 };
 
 /* SPI */
diff --git a/trunk/arch/arm/mach-imx/mach-mx31_3ds.c b/trunk/arch/arm/mach-imx/mach-mx31_3ds.c
index c20be7530927..aa2ebe6bae34 100644
--- a/trunk/arch/arm/mach-imx/mach-mx31_3ds.c
+++ b/trunk/arch/arm/mach-imx/mach-mx31_3ds.c
@@ -494,7 +494,7 @@ static struct mc13xxx_platform_data mc13783_pdata = {
 		.regulators = mx31_3ds_regulators,
 		.num_regulators = ARRAY_SIZE(mx31_3ds_regulators),
 	},
-	.flags  = MC13783_USE_REGULATOR | MC13783_USE_TOUCHSCREEN,
+	.flags  = MC13XXX_USE_REGULATOR | MC13XXX_USE_TOUCHSCREEN,
 };
 
 /* SPI */
diff --git a/trunk/arch/arm/mach-imx/mach-pcm038.c b/trunk/arch/arm/mach-imx/mach-pcm038.c
index 2d6a64bbac44..d033774ebf23 100644
--- a/trunk/arch/arm/mach-imx/mach-pcm038.c
+++ b/trunk/arch/arm/mach-imx/mach-pcm038.c
@@ -266,8 +266,8 @@ static struct mc13xxx_platform_data pcm038_pmic = {
 		.regulators = pcm038_regulators,
 		.num_regulators = ARRAY_SIZE(pcm038_regulators),
 	},
-	.flags = MC13783_USE_ADC | MC13783_USE_REGULATOR |
-		 MC13783_USE_TOUCHSCREEN,
+	.flags = MC13XXX_USE_ADC | MC13XXX_USE_REGULATOR |
+		 MC13XXX_USE_TOUCHSCREEN,
 };
 
 static struct spi_board_info pcm038_spi_board_info[] __initdata = {