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/ts_filter_linear.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'drivers/input/touchscreen/ts_filter_linear.c') diff --git a/drivers/input/touchscreen/ts_filter_linear.c b/drivers/input/touchscreen/ts_filter_linear.c index 4803e17ae49..c336252d0ff 100644 --- a/drivers/input/touchscreen/ts_filter_linear.c +++ b/drivers/input/touchscreen/ts_filter_linear.c @@ -24,15 +24,13 @@ * */ -#include +#include "ts_filter_linear.h" #include #include #include -/* - * sysfs functions - */ +/* sysfs functions */ static ssize_t const_attr_show(struct kobject *kobj, @@ -82,9 +80,7 @@ static ssize_t const_store(struct const_obj *obj, struct const_attribute *attr, return count; } -/* - * filter functions - */ +/* filter functions */ static struct ts_filter *ts_filter_linear_create(struct platform_device *pdev, void *conf, int count_coords) @@ -118,7 +114,6 @@ static struct ts_filter *ts_filter_linear_create(struct platform_device *pdev, tsfl->const_ktype.default_attrs = tsfl->attrs; tsfl->c_obj.tsfl = tsfl; /* kernel frees tsfl in const_release */ - /* TODO: /sys/ts-calibration is not OK */ ret = kobject_init_and_add(&tsfl->c_obj.kobj, &tsfl->const_ktype, &pdev->dev.kobj, "calibration"); if (ret) { -- cgit v1.2.3