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 --- drivers/input/touchscreen/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/input/touchscreen/Kconfig') diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index 5db7a67d5b2..014a9e7a1ef 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -50,7 +50,7 @@ config TOUCHSCREEN_FILTER_LINEAR depends on INPUT_TOUCHSCREEN && TOUCHSCREEN_FILTER default Y help - Say Y here if you want to use the Mean touchscreen filter, it + Say Y here if you want to use the Linear touchscreen filter, it enables the use of calibration data for the touchscreen. endif -- cgit v1.2.3