diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-10-25 01:11:17 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-10-25 01:11:17 -0400 |
| commit | 49327ad2bbbaf1945d5ba431522201574219d150 (patch) | |
| tree | 47beb374d0cfb77d401220f20e8cece4ce4469db /drivers/input/touchscreen/tsc2007.c | |
| parent | f9ce6eb5b6fa8cbcf0a0fb7c5f4203f94730fc52 (diff) | |
| parent | 6521d0bf984ab1cc25795d312e21c438aea8b5d5 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/touchscreen/tsc2007.c')
| -rw-r--r-- | drivers/input/touchscreen/tsc2007.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/tsc2007.c b/drivers/input/touchscreen/tsc2007.c index be23780e8a3e..80467f262331 100644 --- a/drivers/input/touchscreen/tsc2007.c +++ b/drivers/input/touchscreen/tsc2007.c | |||
| @@ -265,7 +265,7 @@ static int __devinit tsc2007_probe(struct i2c_client *client, | |||
| 265 | const struct i2c_device_id *id) | 265 | const struct i2c_device_id *id) |
| 266 | { | 266 | { |
| 267 | struct tsc2007 *ts; | 267 | struct tsc2007 *ts; |
| 268 | struct tsc2007_platform_data *pdata = pdata = client->dev.platform_data; | 268 | struct tsc2007_platform_data *pdata = client->dev.platform_data; |
| 269 | struct input_dev *input_dev; | 269 | struct input_dev *input_dev; |
| 270 | int err; | 270 | int err; |
| 271 | 271 | ||