From 875c6464cc9490277d1c59a0ad905374a88c2b6e Mon Sep 17 00:00:00 2001
From: Marek Vasut <marek.vasut@gmail.com>
Date: Wed, 1 Apr 2009 22:30:07 +0800
Subject: [PATCH] --- yaml --- r: 142819 b: refs/heads/master c:
 50f6bb0ab75794ad02cb5db503cc8c99465ceaf4 h: refs/heads/master i:   142817:
 e1fc7bbcbce24c55f6e69e107f6458230c73e324   142815:
 61d1d0d25de5fb9164e09d8f38a394ddd9575d58 v: v3

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

diff --git a/[refs] b/[refs]
index a4b10497c35d..07eea0abc3f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81854f82c5c1a203b2f5c94f6aa2ed8b8e19f025
+refs/heads/master: 50f6bb0ab75794ad02cb5db503cc8c99465ceaf4
diff --git a/trunk/arch/arm/mach-pxa/cm-x2xx.c b/trunk/arch/arm/mach-pxa/cm-x2xx.c
index 117b5435f8d5..b50ef39eabfc 100644
--- a/trunk/arch/arm/mach-pxa/cm-x2xx.c
+++ b/trunk/arch/arm/mach-pxa/cm-x2xx.c
@@ -121,7 +121,7 @@ static inline void cmx2xx_init_dm9000(void) {}
 /* UCB1400 touchscreen controller */
 #if defined(CONFIG_TOUCHSCREEN_UCB1400) || defined(CONFIG_TOUCHSCREEN_UCB1400_MODULE)
 static struct platform_device cmx2xx_ts_device = {
-	.name		= "ucb1400_ts",
+	.name		= "ucb1400_core",
 	.id		= -1,
 };