Input: Break out MT data

[firefly-linux-kernel-4.4.55.git] / include / linux / input.h

diff --git a/include/linux/input.h b/include/linux/input.h
index 725dcd0f63a4bf262f05555c528a20c68d8b1a75..9da4f5796fd63e35c35759ad4e7dba069ce0213a 100644 (file)
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -1203,11 +1203,7 @@ struct ff_effect {
  *     software autorepeat
  * @timer: timer for software autorepeat
  * @rep: current values for autorepeat parameters (delay, rate)
- * @mt: pointer to array of struct input_mt_slot holding current values
- *     of tracked contacts
- * @mtsize: number of MT slots the device uses
- * @slot: MT slot currently being transmitted
- * @trkid: stores MT tracking ID for the current contact
+ * @mt: pointer to multitouch state
  * @absinfo: array of &struct input_absinfo elements holding information
  *     about absolute axes (current value, min, max, flat, fuzz,
  *     resolution)
@@ -1287,10 +1283,7 @@ struct input_dev {
 
        int rep[REP_CNT];
 
-       struct input_mt_slot *mt;
-       int mtsize;
-       int slot;
-       int trkid;
+       struct input_mt *mt;
 
        struct input_absinfo *absinfo;