diff options
| author | Gustavo Padovan <gustavo.padovan@collabora.com> | 2018-07-06 13:34:13 -0300 |
|---|---|---|
| committer | Gustavo Padovan <gustavo.padovan@collabora.com> | 2018-07-06 13:34:13 -0300 |
| commit | e22e953189f7b3a3bfc7efb511d2b1d1454adde5 (patch) | |
| tree | 87e56e966e1f676f2c9389c41aa5c37969f757f1 /include/linux/input/mt.h | |
| parent | a012024571d98e2e4bf29a9168fb7ddc44b7ab86 (diff) | |
| parent | 4da1d4c751c9b1b713c13043bad7c4d27cd1418c (diff) | |
Merge drm-upstream/drm-next into drm-misc-next
Pull in the malidp writeback implementation for further work on writeback in drm-misc-next.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Diffstat (limited to 'include/linux/input/mt.h')
| -rw-r--r-- | include/linux/input/mt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/input/mt.h b/include/linux/input/mt.h index d7188de4db96..3f4bf60b0bb5 100644 --- a/include/linux/input/mt.h +++ b/include/linux/input/mt.h @@ -100,7 +100,7 @@ static inline bool input_is_mt_axis(int axis) return axis == ABS_MT_SLOT || input_is_mt_value(axis); } -void input_mt_report_slot_state(struct input_dev *dev, +bool input_mt_report_slot_state(struct input_dev *dev, unsigned int tool_type, bool active); void input_mt_report_finger_count(struct input_dev *dev, int count); |