From 3779b1cf0be55e0affcff56379cdfb8a07fdd840 Mon Sep 17 00:00:00 2001 From: merge Date: Mon, 19 Jan 2009 00:47:51 +0000 Subject: 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 MERGE-via-stable-tracking-hist-fix-touchscreen-filter-include stable-tracking-hist top was fix-touchscreen-filter-include / bb151f28fc8e8923baad96e0f3e8f0ae57af95f5 ... parent commitmessage: From: Nelson Castillo Fix touchscreen filter includes Fix #includes to make the kernel compile again. Signed-off-by: Nelson Castillo --- arch/arm/mach-s3c2440/Kconfig | 1 + arch/arm/mach-s3c2440/mach-gta02.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'arch/arm/mach-s3c2440') 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 -#include -#include -#include +#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; -- cgit v1.2.3