Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/input/mouse/elantech.h b/drivers/input/mouse/elantech.h
index aa4aac5d2198..fabb2b99615c 100644
--- a/drivers/input/mouse/elantech.h
+++ b/drivers/input/mouse/elantech.h
@@ -77,6 +77,11 @@
 #define ETP_YMIN_V2                     (   0 + ETP_EDGE_FUZZ_V2)
 #define ETP_YMAX_V2                     ( 768 - ETP_EDGE_FUZZ_V2)
 
+#define ETP_PMIN_V2                     0
+#define ETP_PMAX_V2                     255
+#define ETP_WMIN_V2                     0
+#define ETP_WMAX_V2                     15
+
 /*
  * For two finger touches the coordinate of each finger gets reported
  * separately but with reduced resolution.
@@ -102,6 +107,7 @@ struct elantech_data {
         unsigned char capabilities;
         bool paritycheck;
         bool jumpy_cursor;
+        bool reports_pressure;
         unsigned char hw_version;
         unsigned int fw_version;
         unsigned int single_finger_reports;