diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-09-04 04:49:39 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-09-04 04:49:57 -0400 |
| commit | efd15f5f4ff63f6ac5d80850686e3d2cc8c4481b (patch) | |
| tree | 40024adbe77a3d660662e639fd765097133d648c /Documentation/input | |
| parent | 6c2794a2984f4c17a58117a68703cc7640f01c5a (diff) | |
| parent | 58c59bc997d86593f0bea41845885917cf304d22 (diff) | |
Merge branch 'master' into for-3.12/upstream
Sync with Linus' tree to be able to apply fixup patch on top
of 9d9a04ee75 ("HID: apple: Add support for the 2013 Macbook Air")
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'Documentation/input')
| -rw-r--r-- | Documentation/input/multi-touch-protocol.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/input/multi-touch-protocol.txt b/Documentation/input/multi-touch-protocol.txt index 2c179613f81b..de139b18184a 100644 --- a/Documentation/input/multi-touch-protocol.txt +++ b/Documentation/input/multi-touch-protocol.txt | |||
| @@ -80,6 +80,8 @@ Userspace can detect that a driver can report more total contacts than slots | |||
| 80 | by noting that the largest supported BTN_TOOL_*TAP event is larger than the | 80 | by noting that the largest supported BTN_TOOL_*TAP event is larger than the |
| 81 | total number of type B slots reported in the absinfo for the ABS_MT_SLOT axis. | 81 | total number of type B slots reported in the absinfo for the ABS_MT_SLOT axis. |
| 82 | 82 | ||
| 83 | The minimum value of the ABS_MT_SLOT axis must be 0. | ||
| 84 | |||
| 83 | Protocol Example A | 85 | Protocol Example A |
| 84 | ------------------ | 86 | ------------------ |
| 85 | 87 | ||