From e49cbb2029637afcfc4ee12cd9532f8c3c9e3785 Mon Sep 17 00:00:00 2001
From: Jonas Bonn <jonas.bonn@gmail.com>
Date: Wed, 19 Nov 2008 17:11:03 +0000
Subject: Move asm/arch/ts.h to mach/ts.h

Signed-off-by: Jonas Bonn <jonas.bonn@gmail.com>
---
 arch/arm/mach-s3c2410/include/mach/ts.h | 30 ++++++++++++++++++++++++++++++
 arch/arm/mach-s3c2410/mach-gta01.c      |  2 +-
 arch/arm/mach-s3c2440/mach-gta02.c      |  2 +-
 drivers/input/touchscreen/s3c2410_ts.c  |  2 +-
 include/asm-arm/arch-s3c2410/ts.h       | 30 ------------------------------
 5 files changed, 33 insertions(+), 33 deletions(-)
 create mode 100644 arch/arm/mach-s3c2410/include/mach/ts.h
 delete mode 100644 include/asm-arm/arch-s3c2410/ts.h

diff --git a/arch/arm/mach-s3c2410/include/mach/ts.h b/arch/arm/mach-s3c2410/include/mach/ts.h
new file mode 100644
index 00000000000..6fa75f6c0ab
--- /dev/null
+++ b/arch/arm/mach-s3c2410/include/mach/ts.h
@@ -0,0 +1,30 @@
+/* arch/arm/mach-s3c2410/include/mach/ts.h
+ *
+ * Copyright (c) 2005 Arnaud Patard <arnaud.patard@rtp-net.org>
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ *
+ *  Changelog:
+ *     24-Mar-2005     RTP     Created file
+ *     03-Aug-2005     RTP     Renamed to ts.h
+ */
+
+#ifndef __ASM_ARM_TS_H
+#define __ASM_ARM_TS_H
+
+struct s3c2410_ts_mach_info {
+	int             delay;
+	int             presc;
+	int             oversampling_shift;
+	int		excursion_filter_len_bits;
+	int		reject_threshold_vs_avg;
+};
+
+void set_s3c2410ts_info(struct s3c2410_ts_mach_info *hard_s3c2410ts_info);
+
+#endif /* __ASM_ARM_TS_H */
+
diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
index b37f43c6496..83c29eb56b5 100644
--- a/arch/arm/mach-s3c2410/mach-gta01.c
+++ b/arch/arm/mach-s3c2410/mach-gta01.c
@@ -34,7 +34,7 @@
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
 #include <linux/serial_core.h>
-#include <asm/arch/ts.h>
+#include <mach/ts.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/spi_bitbang.h>
 #include <linux/mmc/mmc.h>
diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
index ee6159bd571..6f9cf3e538f 100644
--- a/arch/arm/mach-s3c2440/mach-gta02.c
+++ b/arch/arm/mach-s3c2440/mach-gta02.c
@@ -62,7 +62,7 @@
 #include <mach/regs-gpioj.h>
 #include <mach/fb.h>
 #include <mach/mci.h>
-#include <asm/arch-s3c2410/ts.h>
+#include <mach/ts.h>
 #include <mach/spi.h>
 #include <asm/arch-s3c2410/spi-gpio.h>
 #include <mach/usb-control.h>
diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
index 0150f85db70..8a4fefa02fe 100644
--- a/drivers/input/touchscreen/s3c2410_ts.c
+++ b/drivers/input/touchscreen/s3c2410_ts.c
@@ -55,7 +55,7 @@
 #include <asm/irq.h>
 
 #include <mach/regs-gpio.h>
-#include <asm/arch-s3c2410/ts.h>
+#include <mach/ts.h>
 
 #include <asm/plat-s3c/regs-adc.h>
 
diff --git a/include/asm-arm/arch-s3c2410/ts.h b/include/asm-arm/arch-s3c2410/ts.h
deleted file mode 100644
index 44c1e4b2cf7..00000000000
--- a/include/asm-arm/arch-s3c2410/ts.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* linux/include/asm/arch-s3c2410/ts.h
- *
- * Copyright (c) 2005 Arnaud Patard <arnaud.patard@rtp-net.org>
- *
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- *
- *  Changelog:
- *     24-Mar-2005     RTP     Created file
- *     03-Aug-2005     RTP     Renamed to ts.h
- */
-
-#ifndef __ASM_ARM_TS_H
-#define __ASM_ARM_TS_H
-
-struct s3c2410_ts_mach_info {
-	int             delay;
-	int             presc;
-	int             oversampling_shift;
-	int		excursion_filter_len_bits;
-	int		reject_threshold_vs_avg;
-};
-
-void set_s3c2410ts_info(struct s3c2410_ts_mach_info *hard_s3c2410ts_info);
-
-#endif /* __ASM_ARM_TS_H */
-
-- 
cgit v1.2.3