From d84ed0dbf49060265bfc7139e9ba8a8c109ed555 Mon Sep 17 00:00:00 2001
From: Grant Likely <grant.likely@secretlab.ca>
Date: Wed, 30 Mar 2011 00:02:29 -0600
Subject: [PATCH] --- yaml --- r: 243532 b: refs/heads/master c:
 e282326600f31ab38d8814fd6deb277a48850c35 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/arm/mach-versatile/core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 30ef504d0577..2038ef4c2a70 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 458f7f8f819b63431f1098a086fafce4a503fb77
+refs/heads/master: e282326600f31ab38d8814fd6deb277a48850c35
diff --git a/trunk/arch/arm/mach-versatile/core.c b/trunk/arch/arm/mach-versatile/core.c
index 96e59e3ee4f5..eb7ffa0ee8b5 100644
--- a/trunk/arch/arm/mach-versatile/core.c
+++ b/trunk/arch/arm/mach-versatile/core.c
@@ -314,7 +314,7 @@ static struct mmci_platform_data mmc0_plat_data = {
 	.gpio_cd	= -1,
 };
 
-static struct resource chalcd_resources[] = {
+static struct resource char_lcd_resources[] = {
 	{
 		.start = VERSATILE_CHAR_LCD_BASE,
 		.end   = (VERSATILE_CHAR_LCD_BASE + SZ_4K - 1),