From faeaac111736f670c0461b969d4c67e4481c36a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Fri, 5 Mar 2010 13:44:26 -0800 Subject: [PATCH] --- yaml --- r: 186331 b: refs/heads/master c: 2a83319182afe9ba7d958180b3bd3a32a9e3d1be h: refs/heads/master i: 186329: 986673f3dba58db4d036853a5c8a2800bce23c37 186327: 2d5b745c3adbbf88751a2fa9809eadce19aeccfa v: v3 --- [refs] | 2 +- trunk/drivers/input/touchscreen/mc13783_ts.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 127b9b7800d8..aeffd3d7e836 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 57205026da070b59e9546df352fe465f1aeacf99 +refs/heads/master: 2a83319182afe9ba7d958180b3bd3a32a9e3d1be diff --git a/trunk/drivers/input/touchscreen/mc13783_ts.c b/trunk/drivers/input/touchscreen/mc13783_ts.c index be115b3b65eb..be54fd639aca 100644 --- a/trunk/drivers/input/touchscreen/mc13783_ts.c +++ b/trunk/drivers/input/touchscreen/mc13783_ts.c @@ -44,7 +44,7 @@ static irqreturn_t mc13783_ts_handler(int irq, void *data) { struct mc13783_ts_priv *priv = data; - mc13783_ackirq(priv->mc13783, irq); + mc13783_irq_ack(priv->mc13783, irq); /* * Kick off reading coordinates. Note that if work happens already @@ -135,7 +135,7 @@ static int mc13783_ts_open(struct input_dev *dev) mc13783_lock(priv->mc13783); - mc13783_ackirq(priv->mc13783, MC13783_IRQ_TS); + mc13783_irq_ack(priv->mc13783, MC13783_IRQ_TS); ret = mc13783_irq_request(priv->mc13783, MC13783_IRQ_TS, mc13783_ts_handler, MC13783_TS_NAME, priv);