diff options
| author | merge <null@invalid> | 2009-01-19 00:47:51 +0000 |
|---|---|---|
| committer | Andy Green <agreen@octopus.localdomain> | 2009-01-19 00:47:51 +0000 |
| commit | 3779b1cf0be55e0affcff56379cdfb8a07fdd840 (patch) | |
| tree | f7b05d2e2188885a37ac3be6fd3c0bf075fe05ac /arch | |
| parent | 3a01f98ede89d2d0791393c43625e824f03c3065 (diff) | |
MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-fix-touchscreen-filter-include-1232325217
pending-tracking-hist top was MERGE-via-stable-tracking-fix-touchscreen-filter-include-1232325217 / d063e8c6d85c48de80b3d158bfa98d5a97149711 ... parent commitmessage:
From: merge <null@invalid>
MERGE-via-stable-tracking-hist-fix-touchscreen-filter-include
stable-tracking-hist top was fix-touchscreen-filter-include / bb151f28fc8e8923baad96e0f3e8f0ae57af95f5 ... parent commitmessage:
From: Nelson Castillo <arhuaco@freaks-unidos.net>
Fix touchscreen filter includes
Fix #includes to make the kernel compile again.
Signed-off-by: Nelson Castillo <arhuaco@freaks-unidos.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-s3c2410/include/mach/ts.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2440/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-gta02.c | 8 |
3 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/ts.h b/arch/arm/mach-s3c2410/include/mach/ts.h index ab4433f10bd..1b451ea1624 100644 --- a/arch/arm/mach-s3c2410/include/mach/ts.h +++ b/arch/arm/mach-s3c2410/include/mach/ts.h @@ -16,7 +16,7 @@ #ifndef __ASM_ARM_TS_H #define __ASM_ARM_TS_H -#include <linux/ts_filter.h> +#include <../drivers/input/touchscreen/ts_filter.h> struct s3c2410_ts_mach_info { int delay; diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig index 74c3d8e1d74..4102d047ab0 100644 --- a/arch/arm/mach-s3c2440/Kconfig +++ b/arch/arm/mach-s3c2440/Kconfig @@ -96,6 +96,7 @@ config MACH_NEO1973_GTA02 select POWER_SUPPLY select GTA02_HDQ select MACH_NEO1973 + select S3C2410_PWM help Say Y here if you are using the FIC Neo1973 GSM Phone diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c index 4520d7b3ec0..cff7affa0d7 100644 --- a/arch/arm/mach-s3c2440/mach-gta02.c +++ b/arch/arm/mach-s3c2440/mach-gta02.c @@ -103,10 +103,10 @@ #include "../plat-s3c24xx/neo1973_pm_gps.h" -#include <linux/ts_filter_linear.h> -#include <linux/ts_filter_mean.h> -#include <linux/ts_filter_median.h> -#include <linux/ts_filter_group.h> +#include <../drivers/input/touchscreen/ts_filter_linear.h> +#include <../drivers/input/touchscreen/ts_filter_mean.h> +#include <../drivers/input/touchscreen/ts_filter_median.h> +#include <../drivers/input/touchscreen/ts_filter_group.h> /* arbitrates which sensor IRQ owns the shared SPI bus */ static spinlock_t motion_irq_lock; |