diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-06-28 02:00:25 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-06-28 02:00:25 -0400 |
| commit | 31881d74b6dd1a6c530cff61248def4f2da38bee (patch) | |
| tree | be62420cf39192074e13b25553d172b9d5e58a33 /drivers/input/touchscreen/egalax_ts.c | |
| parent | 8855f30cd2b68012571932c7b01290c20be4508c (diff) | |
| parent | 257867dc8d893690c175c1f717f91c3b6d44a63d (diff) | |
Merge branch 'for-next' of git://github.com/rydberg/linux into next
Pull in changes from Henrik: "a trivial MT documentation fix".
Diffstat (limited to 'drivers/input/touchscreen/egalax_ts.c')
| -rw-r--r-- | drivers/input/touchscreen/egalax_ts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/egalax_ts.c b/drivers/input/touchscreen/egalax_ts.c index 1602c5b6c094..ef5fcb0945e9 100644 --- a/drivers/input/touchscreen/egalax_ts.c +++ b/drivers/input/touchscreen/egalax_ts.c | |||
| @@ -212,7 +212,7 @@ static int egalax_ts_probe(struct i2c_client *client, | |||
| 212 | input_set_abs_params(input_dev, | 212 | input_set_abs_params(input_dev, |
| 213 | ABS_MT_POSITION_X, 0, EGALAX_MAX_X, 0, 0); | 213 | ABS_MT_POSITION_X, 0, EGALAX_MAX_X, 0, 0); |
| 214 | input_set_abs_params(input_dev, | 214 | input_set_abs_params(input_dev, |
| 215 | ABS_MT_POSITION_X, 0, EGALAX_MAX_Y, 0, 0); | 215 | ABS_MT_POSITION_Y, 0, EGALAX_MAX_Y, 0, 0); |
| 216 | input_mt_init_slots(input_dev, MAX_SUPPORT_POINTS, 0); | 216 | input_mt_init_slots(input_dev, MAX_SUPPORT_POINTS, 0); |
| 217 | 217 | ||
| 218 | input_set_drvdata(input_dev, ts); | 218 | input_set_drvdata(input_dev, ts); |