From 4f0d7f43b8a9d35be25f520834bbb13f2dae10f3 Mon Sep 17 00:00:00 2001 From: merge Date: Mon, 29 Dec 2008 12:11:49 +0000 Subject: 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 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 --- drivers/input/touchscreen/ts_filter_mean.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'drivers/input/touchscreen/ts_filter_mean.c') diff --git a/drivers/input/touchscreen/ts_filter_mean.c b/drivers/input/touchscreen/ts_filter_mean.c index a2f1748a686..a7b4a5aac6f 100644 --- a/drivers/input/touchscreen/ts_filter_mean.c +++ b/drivers/input/touchscreen/ts_filter_mean.c @@ -56,7 +56,8 @@ static void ts_filter_mean_clear(struct ts_filter *tsf) (tsf->next->api->clear)(tsf->next); } -static struct ts_filter *ts_filter_mean_create(void *config, int count_coords) +static struct ts_filter *ts_filter_mean_create(struct platform_device *pdev, + void *config, int count_coords) { int *p; int n; @@ -96,7 +97,8 @@ static struct ts_filter *ts_filter_mean_create(void *config, int count_coords) return &tsfs->tsf; } -static void ts_filter_mean_destroy(struct ts_filter *tsf) +static void ts_filter_mean_destroy(struct platform_device *pdev, + struct ts_filter *tsf) { struct ts_filter_mean *tsfs = (struct ts_filter_mean *)tsf; -- cgit v1.2.3