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 /drivers/input/touchscreen/ts_filter_median.c | |
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 'drivers/input/touchscreen/ts_filter_median.c')
-rw-r--r-- | drivers/input/touchscreen/ts_filter_median.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/input/touchscreen/ts_filter_median.c b/drivers/input/touchscreen/ts_filter_median.c index 883ab06bff0..b3b6a9c1e5c 100644 --- a/drivers/input/touchscreen/ts_filter_median.c +++ b/drivers/input/touchscreen/ts_filter_median.c @@ -32,7 +32,7 @@ #include <linux/errno.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <linux/ts_filter_median.h> +#include "ts_filter_median.h" static void ts_filter_median_insert(int *p, int sample, int count) { @@ -141,8 +141,9 @@ static void ts_filter_median_scale(struct ts_filter *tsf, int *coords) (tsf->next->api->scale)(tsf->next, coords); } -/* give us the raw sample data coords, and if we return 1 then you can - * get a filtered coordinate from coords: if we return 0 you didn't +/* + * Give us the raw sample data coords, and if we return 1 then you can + * get a filtered coordinate from coords. If we return 0 you didn't * fill all the filters with samples yet. */ @@ -169,9 +170,10 @@ static int ts_filter_median_process(struct ts_filter *tsf, int *coords) /* discard the oldest sample in median sorted array */ tsfm->valid--; - /* sum the middle 3 in the median sorted arrays. We don't divide back + /* + * Sum the middle 3 in the median sorted arrays. We don't divide back * down which increases the sum resolution by a factor of 3 until the - * scale API is called + * scale API is called. */ for (n = 0; n < tsfm->tsf.count_coords; n++) /* perform the deletion of the oldest sample */ |