From 7c1875add486b25d0c08c928752b208123f163c2 Mon Sep 17 00:00:00 2001
From: Maurus Cuelenaere <mcuelenaere@gmail.com>
Date: Tue, 4 May 2010 13:12:41 +0200
Subject: [PATCH] --- yaml --- r: 192071 b: refs/heads/master c:
 73e59b1d6b69f5ae02e3be5e2b3259c46d8bb27a h: refs/heads/master i:   192069:
 25d5cc59fa8873ec10b59d20bf5a72c1f0dcef10   192067:
 922512735cf82b213d345d0cfe84370dc2e3f2ac   192063:
 bf767adc819ef98d5ad7d235fc74e852857c2e16 v: v3

---
 [refs]                                                         | 2 +-
 trunk/arch/arm/mach-s3c2410/mach-h1940.c                       | 2 +-
 trunk/arch/arm/plat-s3c24xx/devs.c                             | 3 +--
 .../include/mach => plat-samsung/include/plat}/ts.h            | 2 +-
 trunk/drivers/input/touchscreen/s3c2410_ts.c                   | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)
 rename trunk/arch/arm/{mach-s3c2410/include/mach => plat-samsung/include/plat}/ts.h (92%)

diff --git a/[refs] b/[refs]
index 390acd51dea3..c5a3edb8011a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51ffd971edb2d5187007967c14712a8ed956c092
+refs/heads/master: 73e59b1d6b69f5ae02e3be5e2b3259c46d8bb27a
diff --git a/trunk/arch/arm/mach-s3c2410/mach-h1940.c b/trunk/arch/arm/mach-s3c2410/mach-h1940.c
index d2a2fad7db97..b1f7dbb3bb60 100644
--- a/trunk/arch/arm/mach-s3c2410/mach-h1940.c
+++ b/trunk/arch/arm/mach-s3c2410/mach-h1940.c
@@ -46,7 +46,6 @@
 #include <mach/h1940.h>
 #include <mach/h1940-latch.h>
 #include <mach/fb.h>
-#include <mach/ts.h>
 #include <plat/udc.h>
 #include <plat/iic.h>
 
@@ -57,6 +56,7 @@
 #include <plat/pll.h>
 #include <plat/pm.h>
 #include <plat/mci.h>
+#include <plat/ts.h>
 
 static struct map_desc h1940_iodesc[] __initdata = {
 	[0] = {
diff --git a/trunk/arch/arm/plat-s3c24xx/devs.c b/trunk/arch/arm/plat-s3c24xx/devs.c
index cd5b41d0b5a4..58583732b29a 100644
--- a/trunk/arch/arm/plat-s3c24xx/devs.c
+++ b/trunk/arch/arm/plat-s3c24xx/devs.c
@@ -39,8 +39,7 @@
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/regs-spi.h>
-
-#include <mach/ts.h>
+#include <plat/ts.h>
 
 /* Serial port registrations */
 
diff --git a/trunk/arch/arm/mach-s3c2410/include/mach/ts.h b/trunk/arch/arm/plat-samsung/include/plat/ts.h
similarity index 92%
rename from trunk/arch/arm/mach-s3c2410/include/mach/ts.h
rename to trunk/arch/arm/plat-samsung/include/plat/ts.h
index dc361700d695..8a51675f6b03 100644
--- a/trunk/arch/arm/mach-s3c2410/include/mach/ts.h
+++ b/trunk/arch/arm/plat-samsung/include/plat/ts.h
@@ -1,4 +1,4 @@
-/* linux/include/asm/arch-s3c2410/ts.h
+/* arch/arm/plat-samsung/include/plat/ts.h
  *
  * Copyright (c) 2005 Arnaud Patard <arnaud.patard@rtp-net.org>
  *
diff --git a/trunk/drivers/input/touchscreen/s3c2410_ts.c b/trunk/drivers/input/touchscreen/s3c2410_ts.c
index 98a7d1279486..a2e122878f30 100644
--- a/trunk/drivers/input/touchscreen/s3c2410_ts.c
+++ b/trunk/drivers/input/touchscreen/s3c2410_ts.c
@@ -37,9 +37,9 @@
 
 #include <plat/adc.h>
 #include <plat/regs-adc.h>
+#include <plat/ts.h>
 
 #include <mach/regs-gpio.h>
-#include <mach/ts.h>
 
 #define TSC_SLEEP  (S3C2410_ADCTSC_PULL_UP_DISABLE | S3C2410_ADCTSC_XY_PST(0))