diff options
-rw-r--r-- | arch/arm/mach-s3c2410/mach-h1940.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/devs.c | 3 | ||||
-rw-r--r-- | arch/arm/plat-samsung/include/plat/ts.h (renamed from arch/arm/mach-s3c2410/include/mach/ts.h) | 2 | ||||
-rw-r--r-- | drivers/input/touchscreen/s3c2410_ts.c | 2 |
4 files changed, 4 insertions, 5 deletions
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] = { |
diff --git a/arch/arm/plat-s3c24xx/devs.c b/arch/arm/plat-s3c24xx/devs.c index cd5b41d0b5a4..58583732b29a 100644 --- a/arch/arm/plat-s3c24xx/devs.c +++ b/arch/arm/plat-s3c24xx/devs.c | |||
@@ -39,8 +39,7 @@ | |||
39 | #include <plat/devs.h> | 39 | #include <plat/devs.h> |
40 | #include <plat/cpu.h> | 40 | #include <plat/cpu.h> |
41 | #include <plat/regs-spi.h> | 41 | #include <plat/regs-spi.h> |
42 | 42 | #include <plat/ts.h> | |
43 | #include <mach/ts.h> | ||
44 | 43 | ||
45 | /* Serial port registrations */ | 44 | /* Serial port registrations */ |
46 | 45 | ||
diff --git a/arch/arm/mach-s3c2410/include/mach/ts.h b/arch/arm/plat-samsung/include/plat/ts.h index dc361700d695..8a51675f6b03 100644 --- a/arch/arm/mach-s3c2410/include/mach/ts.h +++ b/arch/arm/plat-samsung/include/plat/ts.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* linux/include/asm/arch-s3c2410/ts.h | 1 | /* arch/arm/plat-samsung/include/plat/ts.h |
2 | * | 2 | * |
3 | * Copyright (c) 2005 Arnaud Patard <arnaud.patard@rtp-net.org> | 3 | * Copyright (c) 2005 Arnaud Patard <arnaud.patard@rtp-net.org> |
4 | * | 4 | * |
diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c index 98a7d1279486..a2e122878f30 100644 --- a/drivers/input/touchscreen/s3c2410_ts.c +++ b/drivers/input/touchscreen/s3c2410_ts.c | |||
@@ -37,9 +37,9 @@ | |||
37 | 37 | ||
38 | #include <plat/adc.h> | 38 | #include <plat/adc.h> |
39 | #include <plat/regs-adc.h> | 39 | #include <plat/regs-adc.h> |
40 | #include <plat/ts.h> | ||
40 | 41 | ||
41 | #include <mach/regs-gpio.h> | 42 | #include <mach/regs-gpio.h> |
42 | #include <mach/ts.h> | ||
43 | 43 | ||
44 | #define TSC_SLEEP (S3C2410_ADCTSC_PULL_UP_DISABLE | S3C2410_ADCTSC_XY_PST(0)) | 44 | #define TSC_SLEEP (S3C2410_ADCTSC_PULL_UP_DISABLE | S3C2410_ADCTSC_XY_PST(0)) |
45 | 45 | ||