commit 4e9a94e60d589581799ac7c3341ec4dfac8793a5
author Mohan Pallaka <mpallaka@codeaurora.org> Wed Nov 23 16:34:21 2011 +0530
committer Linux Build Service Account <lnxbuild@localhost> Sat Nov 26 23:45:35 2011 -0700
tree 869698d4d332daf60c3ef68635f086179de8a206
parent 4b0f0d9b57b19ecd3a7d03460cb9682b0dc3544e

input: atmel_maxtouch: Rename mxt_platform_data to maxtouch_platform_data

Opensource driver atmel_mxt_ts has the platform data
structure name as atmel_maxtouch. Avoid name conflict
by renaming atmel_maxtouch driver's platform data to
maxtouch_platform_data.

Change-Id: I4bf3ed83e3eab55c4464de365c6009965da73744
Signed-off-by: Mohan Pallaka <mpallaka@codeaurora.org>

arch/arm/mach-msm/board-msm7x27a.c

diff --git a/arch/arm/mach-msm/board-msm7x27a.c b/arch/arm/mach-msm/board-msm7x27a.c
index aada890..05b4896 100644
--- a/arch/arm/mach-msm/board-msm7x27a.c
+++ b/arch/arm/mach-msm/board-msm7x27a.c
@@ -3041,7 +3041,7 @@
 #define ATMEL_X_OFFSET 13
 #define ATMEL_Y_OFFSET 0
 
-static struct mxt_platform_data atmel_ts_pdata = {
+static struct maxtouch_platform_data atmel_ts_pdata = {
 	.numtouch = 4,
 	.init_platform_hw = atmel_ts_platform_init,
 	.exit_platform_hw = atmel_ts_platform_exit,