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_mean.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_mean.c')
| -rw-r--r-- | drivers/input/touchscreen/ts_filter_mean.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/input/touchscreen/ts_filter_mean.c b/drivers/input/touchscreen/ts_filter_mean.c index a7b4a5aac6f..e4e0f2ac68e 100644 --- a/drivers/input/touchscreen/ts_filter_mean.c +++ b/drivers/input/touchscreen/ts_filter_mean.c @@ -34,7 +34,7 @@ #include <linux/errno.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <linux/ts_filter_mean.h> +#include "ts_filter_mean.h" static void ts_filter_mean_clear_internal(struct ts_filter *tsf) { @@ -63,7 +63,7 @@ static struct ts_filter *ts_filter_mean_create(struct platform_device *pdev, int n; struct ts_filter_mean *tsfs = kzalloc( sizeof(struct ts_filter_mean), GFP_KERNEL); - + if (!tsfs) return NULL; @@ -112,8 +112,9 @@ static void ts_filter_mean_scale(struct ts_filter *tsf, int *coords) (tsf->next->api->scale)(tsf->next, coords); } -/* give us the raw sample data in x and y, and if we return 1 then you can - * get a filtered coordinate from tsm->x and tsm->y: if we return 0 you didn't +/* + * Give us the raw sample data in x and y, and if we return 1 then you can + * get a filtered coordinate from tsm->x and tsm->y. If we return 0 you didn't * fill the filter with samples yet. */ @@ -125,7 +126,8 @@ static int ts_filter_mean_process(struct ts_filter *tsf, int *coords) for (n = 0; n < tsf->count_coords; n++) { - /* has he moved far enough away that we should abandon current + /* + * Has he moved far enough away that we should abandon current * low pass filtering state? */ if ((coords[n] < (tsfs->reported[n] - |