From e06a77918f05ede40c682212e653397905e75673 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Mon, 18 Jul 2011 17:09:37 -0700 Subject: [PATCH] --- yaml --- r: 260784 b: refs/heads/master c: 2c204109ec1018f72114c7f19132a1109a3f0653 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/touchscreen/cy8ctmg110_ts.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 93cf5d232149..199512d6b69a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d448303a77d8925fd06e7b2837bd1826e340bb02 +refs/heads/master: 2c204109ec1018f72114c7f19132a1109a3f0653 diff --git a/trunk/drivers/input/touchscreen/cy8ctmg110_ts.c b/trunk/drivers/input/touchscreen/cy8ctmg110_ts.c index ecdaae5f06c9..d8815c5d54ad 100644 --- a/trunk/drivers/input/touchscreen/cy8ctmg110_ts.c +++ b/trunk/drivers/input/touchscreen/cy8ctmg110_ts.c @@ -193,6 +193,8 @@ static int __devinit cy8ctmg110_probe(struct i2c_client *client, ts->client = client; ts->input = input_dev; + ts->reset_pin = pdata->reset_pin; + ts->irq_pin = pdata->irq_pin; snprintf(ts->phys, sizeof(ts->phys), "%s/input0", dev_name(&client->dev));