diff options
| author | Prashant Gaikwad <pgaikwad@nvidia.com> | 2012-06-04 13:43:19 +0530 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2012-06-04 01:23:23 -0700 |
| commit | 61cb2b285ecc8ee3b19c3a30653b1cf1b1aacf05 (patch) | |
| tree | 0eb8b72b778264ecf29805de379eaca06adc1a7c /drivers/input | |
| parent | 4f5b1e5789b178794bdbe8b4495e04be6219ea84 (diff) | |
Input: synaptics_i2c_rmi: Fix merge
Change-Id: Iac3c7c01b4b571d5a7787f8c6c21ddd9adee92b1
Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com>
Reviewed-on: http://git-master/r/106152
Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>
Tested-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/touchscreen/synaptics_i2c_rmi.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/input/touchscreen/synaptics_i2c_rmi.c b/drivers/input/touchscreen/synaptics_i2c_rmi.c index e7c49ed59021..5a99fa5a6099 100644 --- a/drivers/input/touchscreen/synaptics_i2c_rmi.c +++ b/drivers/input/touchscreen/synaptics_i2c_rmi.c @@ -495,7 +495,6 @@ static int synaptics_ts_probe( set_bit(EV_SYN, ts->input_dev->evbit); set_bit(EV_KEY, ts->input_dev->evbit); set_bit(BTN_TOUCH, ts->input_dev->keybit); - set_bit(BTN_2, ts->input_dev->keybit); set_bit(EV_ABS, ts->input_dev->evbit); inactive_area_left = inactive_area_left * max_x / 0x10000; inactive_area_right = inactive_area_right * max_x / 0x10000; @@ -534,8 +533,6 @@ static int synaptics_ts_probe( input_set_abs_params(ts->input_dev, ABS_Y, -inactive_area_top, max_y + inactive_area_bottom, fuzz_y, 0); input_set_abs_params(ts->input_dev, ABS_PRESSURE, 0, 255, fuzz_p, 0); input_set_abs_params(ts->input_dev, ABS_TOOL_WIDTH, 0, 15, fuzz_w, 0); - input_set_abs_params(ts->input_dev, ABS_HAT0X, -inactive_area_left, max_x + inactive_area_right, fuzz_x, 0); - input_set_abs_params(ts->input_dev, ABS_HAT0Y, -inactive_area_top, max_y + inactive_area_bottom, fuzz_y, 0); input_set_abs_params(ts->input_dev, ABS_MT_POSITION_X, -inactive_area_left, max_x + inactive_area_right, fuzz_x, 0); input_set_abs_params(ts->input_dev, ABS_MT_POSITION_Y, -inactive_area_top, max_y + inactive_area_bottom, fuzz_y, 0); input_set_abs_params(ts->input_dev, ABS_MT_TOUCH_MAJOR, 0, 255, fuzz_p, 0); |