diff options
| author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2010-05-04 13:12:41 +0200 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 18:25:07 +0900 |
| 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 @@ -/* 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. -*/ - -#ifndef __ASM_ARM_TS_H -#define __ASM_ARM_TS_H - -struct s3c2410_ts_mach_info { - int delay; - int presc; - int oversampling_shift; -}; - -extern void s3c24xx_ts_set_platdata(struct s3c2410_ts_mach_info *); - -#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 @@ #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] = { |