diff options
| author | merge <null@invalid> | 2008-12-29 12:11:49 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-12-29 12:11:49 +0000 |
| commit | 4f0d7f43b8a9d35be25f520834bbb13f2dae10f3 (patch) | |
| tree | c75c07e7c55a1004996754651484514e7530d38e /include/linux/ts_filter.h | |
| parent | 39a497b0421174c3f23ef3dffb0675a4db3aa3a0 (diff) | |
MERGE-via-pending-tracking-hist-this-patch-gets-the-linux-mci-
pending-tracking-hist top was this-patch-gets-the-linux-mci- / f45f6d893a0dc65a6041a2c0127e9970427a85da ... parent commitmessage:
From: Balaji Rao <balajirrao@openmoko.org>
This patch gets the Linux mci stack to use the voltage it negotiated before
with the uSD card on resume. Without this, it always reverts to and stays at
3.3V.
Signed-off-by: Balaji Rao <balajirrao@openmoko.org>
Diffstat (limited to 'include/linux/ts_filter.h')
| -rw-r--r-- | include/linux/ts_filter.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/include/linux/ts_filter.h b/include/linux/ts_filter.h index 715f1badbf4..167104482dd 100644 --- a/include/linux/ts_filter.h +++ b/include/linux/ts_filter.h @@ -7,6 +7,8 @@ * (c) 2008 Andy Green <andy@openmoko.com> */ +#include <linux/platform_device.h> + #define MAX_TS_FILTER_CHAIN 4 /* max filters you can chain up */ #define MAX_TS_FILTER_COORDS 3 /* X, Y and Z (pressure) */ @@ -15,8 +17,9 @@ struct ts_filter; /* operations that a filter can perform */ struct ts_filter_api { - struct ts_filter * (*create)(void *config, int count_coords); - void (*destroy)(struct ts_filter *filter); + struct ts_filter * (*create)(struct platform_device *pdev, void *config, + int count_coords); + void (*destroy)(struct platform_device *pdev, struct ts_filter *filter); void (*clear)(struct ts_filter *filter); int (*process)(struct ts_filter *filter, int *coords); void (*scale)(struct ts_filter *filter, int *coords); @@ -41,10 +44,13 @@ struct ts_filter { * array and fills in ->next pointers to create the chain */ -extern int ts_filter_create_chain(struct ts_filter_api **api, void **config, - struct ts_filter **list, int count_coords); +extern int ts_filter_create_chain(struct platform_device *pdev, + struct ts_filter_api **api, void **config, + struct ts_filter **list, int count_coords); /* helper to destroy a whole chain from the list of filter pointers */ -extern void ts_filter_destroy_chain(struct ts_filter **list); +extern void ts_filter_destroy_chain(struct platform_device *pdev, + struct ts_filter **list); + #endif |