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 /Documentation/input | |
parent | 5157b4aa5b7de8787b6318e61bcc285031bb9088 (diff) | |
parent | 26a6931ba7656dc0ebebee615ba87db8a8e71f2b (diff) | |
download | linux-1d7aec304147aadcbc66ef9ab691208f9f22b6a8.tar.gz linux-1d7aec304147aadcbc66ef9ab691208f9f22b6a8.tar.bz2 linux-1d7aec304147aadcbc66ef9ab691208f9f22b6a8.zip |
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 'Documentation/input')
-rw-r--r-- | Documentation/input/elantech.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/input/elantech.txt b/Documentation/input/elantech.txt index a10c3b6ba7c4..56941ae1f5db 100644 --- a/Documentation/input/elantech.txt +++ b/Documentation/input/elantech.txt @@ -333,14 +333,14 @@ byte 0: byte 1: bit 7 6 5 4 3 2 1 0 - x15 x14 x13 x12 x11 x10 x9 x8 + . . . . . x10 x9 x8 byte 2: bit 7 6 5 4 3 2 1 0 x7 x6 x5 x4 x4 x2 x1 x0 - x15..x0 = absolute x value (horizontal) + x10..x0 = absolute x value (horizontal) byte 3: @@ -350,14 +350,14 @@ byte 3: byte 4: bit 7 6 5 4 3 2 1 0 - y15 y14 y13 y12 y11 y10 y8 y8 + . . . . . . y9 y8 byte 5: bit 7 6 5 4 3 2 1 0 y7 y6 y5 y4 y3 y2 y1 y0 - y15..y0 = absolute y value (vertical) + y9..y0 = absolute y value (vertical) 4.2.2 Two finger touch |