aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Bonn <jonas.bonn@gmail.com>2008-11-19 17:11:03 +0000
committerAndy Green <agreen@pads.home.warmcat.com>2008-11-19 17:11:03 +0000
commite49cbb2029637afcfc4ee12cd9532f8c3c9e3785 (patch)
tree2048913111f9c1b1a4a64e50e9250deae1fb6766
parentaf8872f745d96854f563e20b710985f2da014651 (diff)
Move asm/arch/ts.h to mach/ts.h
Signed-off-by: Jonas Bonn <jonas.bonn@gmail.com>
-rw-r--r--arch/arm/mach-s3c2410/include/mach/ts.h (renamed from include/asm-arm/arch-s3c2410/ts.h)2
-rw-r--r--arch/arm/mach-s3c2410/mach-gta01.c2
-rw-r--r--arch/arm/mach-s3c2440/mach-gta02.c2
-rw-r--r--drivers/input/touchscreen/s3c2410_ts.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-arm/arch-s3c2410/ts.h b/arch/arm/mach-s3c2410/include/mach/ts.h
index 44c1e4b2cf7..6fa75f6c0ab 100644
--- a/include/asm-arm/arch-s3c2410/ts.h
+++ b/arch/arm/mach-s3c2410/include/mach/ts.h
@@ -1,4 +1,4 @@
-/* linux/include/asm/arch-s3c2410/ts.h
+/* arch/arm/mach-s3c2410/include/mach/ts.h
*
* Copyright (c) 2005 Arnaud Patard <arnaud.patard@rtp-net.org>
*
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>