diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-03 03:11:15 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-03 03:11:15 +0400 |
| commit | 74fb838cd4914849d9175c8bf03c91673f3f8d25 (patch) | |
| tree | ab85719a208f2956e97a3e44d9550f6b36df0be6 /drivers/input/touchscreen/tsc40.c | |
| parent | 23e44302b30ea15c538c3fcc4631c56358ae2feb (diff) | |
| parent | 32ed1911fc79908d704023317d4ddeb3883fd07e (diff) | |
| download | linux-74fb838cd4914849d9175c8bf03c91673f3f8d25.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input subsystem fixes from Dmitry Torokhov:
"Just a few driver fixes."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: tsc40 - remove wrong announcement of pressure support
Input: lpc32xx-keys - select INPUT_MATRIXKMAP
Input: pxa27x_keypad - clear pending interrupts on keypad config
Input: wacom - correct bad Cintiq 24HD check
Input: wacom - add INPUT_PROP_DIRECT flag to Cintiq 24HD
Input: egalax_ts - get gpio from devicetree
Diffstat (limited to 'drivers/input/touchscreen/tsc40.c')
| -rw-r--r-- | drivers/input/touchscreen/tsc40.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/tsc40.c b/drivers/input/touchscreen/tsc40.c index 63209aaa55f0..eb96f168fb9d 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); |