aboutsummaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2012-11-19 11:30:48 -0500
committerSteven Rostedt <rostedt@goodmis.org>2012-11-19 11:30:48 -0500
commitbc0bad8583e9e8d068e911abf95486cda6255140 (patch)
tree88df0397634674192b49c21b53d3162c418c8606 /drivers/input
parentaba4db3afbef038fc3462c718f1fb6adf6607602 (diff)
parent155e05410f861fda0042d1e6dc5b1b7944c4c85a (diff)
Merge tag 'v3.2.34' into v3.2-rt
This is the 3.2.34 stable release
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/tsc40.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/tsc40.c b/drivers/input/touchscreen/tsc40.c
index 29d5ed4dd31c..80d46100d37e 100644
--- a/drivers/input/touchscreen/tsc40.c
+++ b/drivers/input/touchscreen/tsc40.c
@@ -107,7 +107,6 @@ static int tsc_connect(struct serio *serio, struct serio_driver *drv)
__set_bit(BTN_TOUCH, input_dev->keybit);
input_set_abs_params(ptsc->dev, ABS_X, 0, 0x3ff, 0, 0);
input_set_abs_params(ptsc->dev, ABS_Y, 0, 0x3ff, 0, 0);
- input_set_abs_params(ptsc->dev, ABS_PRESSURE, 0, 0, 0, 0);
serio_set_drvdata(serio, ptsc);