diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-05 07:53:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-05 07:53:18 -0700 |
| commit | 1d7aec304147aadcbc66ef9ab691208f9f22b6a8 (patch) | |
| tree | 155e0a00c48e3b3c6fb9bfa1de760d53c38cde55 /drivers/input/mouse/psmouse.h | |
| parent | 5157b4aa5b7de8787b6318e61bcc285031bb9088 (diff) | |
| parent | 26a6931ba7656dc0ebebee615ba87db8a8e71f2b (diff) | |
| download | op-kernel-dev-1d7aec304147aadcbc66ef9ab691208f9f22b6a8.zip op-kernel-dev-1d7aec304147aadcbc66ef9ab691208f9f22b6a8.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: joydev - allow binding to button-only devices
Input: elantech - ignore high bits in the position coordinates
Input: elantech - allow forcing Elantech protocol
Input: elantech - fix firmware version check
Input: ati_remote - add some missing devices from lirc_atiusb
Input: eeti_ts - cancel pending work when going to suspend
Input: Add support of Synaptics Clickpad device
Revert "Input: ALPS - add signature for HP Pavilion dm3 laptops"
Input: psmouse - ignore parity error for basic protocols
Diffstat (limited to 'drivers/input/mouse/psmouse.h')
| -rw-r--r-- | drivers/input/mouse/psmouse.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h index e053bdd..593e910 100644 --- a/drivers/input/mouse/psmouse.h +++ b/drivers/input/mouse/psmouse.h @@ -47,6 +47,7 @@ struct psmouse { unsigned char pktcnt; unsigned char pktsize; unsigned char type; + bool ignore_parity; bool acks_disable_command; unsigned int model; unsigned long last; |
