diff options
author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2010-05-04 07:12:41 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:25:07 -0400 |
commit | 73e59b1d6b69f5ae02e3be5e2b3259c46d8bb27a (patch) | |
tree | 87bb82e794e3704eb7039cbea7df8da7097ce906 /arch/arm/mach-s3c2410 | |
parent | 51ffd971edb2d5187007967c14712a8ed956c092 (diff) |
ARM: SAMSUNG: Move mach/ts.h to plat/ts.h
This moves mach-s3c2410/include/mach/ts.h to plat-samsung/include/plat/ts.h in
order to prepare for s3c64xx support in the touchscreen driver.
Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/mach-s3c2410')
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/ts.h | 21 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/mach-h1940.c | 2 |
2 files changed, 1 insertions, 22 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/ts.h b/arch/arm/mach-s3c2410/include/mach/ts.h deleted file mode 100644 index dc361700d695..000000000000 --- a/arch/arm/mach-s3c2410/include/mach/ts.h +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | /* linux/include/asm/arch-s3c2410/ts.h | ||
2 | * | ||
3 | * Copyright (c) 2005 Arnaud Patard <arnaud.patard@rtp-net.org> | ||
4 | * | ||
5 | * This program is free software; you can redistribute it and/or modify | ||
6 | * it under the terms of the GNU General Public License version 2 as | ||
7 | * published by the Free Software Foundation. | ||
8 | */ | ||
9 | |||
10 | #ifndef __ASM_ARM_TS_H | ||
11 | #define __ASM_ARM_TS_H | ||
12 | |||
13 | struct s3c2410_ts_mach_info { | ||
14 | int delay; | ||
15 | int presc; | ||
16 | int oversampling_shift; | ||
17 | }; | ||
18 | |||
19 | extern void s3c24xx_ts_set_platdata(struct s3c2410_ts_mach_info *); | ||
20 | |||
21 | #endif /* __ASM_ARM_TS_H */ | ||
diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c index d2a2fad7db97..b1f7dbb3bb60 100644 --- a/arch/arm/mach-s3c2410/mach-h1940.c +++ b/arch/arm/mach-s3c2410/mach-h1940.c | |||
@@ -46,7 +46,6 @@ | |||
46 | #include <mach/h1940.h> | 46 | #include <mach/h1940.h> |
47 | #include <mach/h1940-latch.h> | 47 | #include <mach/h1940-latch.h> |
48 | #include <mach/fb.h> | 48 | #include <mach/fb.h> |
49 | #include <mach/ts.h> | ||
50 | #include <plat/udc.h> | 49 | #include <plat/udc.h> |
51 | #include <plat/iic.h> | 50 | #include <plat/iic.h> |
52 | 51 | ||
@@ -57,6 +56,7 @@ | |||
57 | #include <plat/pll.h> | 56 | #include <plat/pll.h> |
58 | #include <plat/pm.h> | 57 | #include <plat/pm.h> |
59 | #include <plat/mci.h> | 58 | #include <plat/mci.h> |
59 | #include <plat/ts.h> | ||
60 | 60 | ||
61 | static struct map_desc h1940_iodesc[] __initdata = { | 61 | static struct map_desc h1940_iodesc[] __initdata = { |
62 | [0] = { | 62 | [0] = { |