---

yaml --- r: 260784 b: refs/heads/master c: 2c20410 h: refs/heads/master v: v3
git-mirror · Jul 19, 2011 · e06a779 · e06a779
1 parent dd0cda3
commit e06a779
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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));