diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-06-12 16:24:36 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-06-12 16:24:36 -0700 |
| commit | 01f7e67a053f7f5696fbdefe2b066303469b6db5 (patch) | |
| tree | aebc19aad8327cd0408de71d0621fea43589ed75 /include/linux | |
| parent | Input: silead - add MSSL0002 ACPI HID (diff) | |
| parent | Input: do not assign new tracking ID when changing tool type (diff) | |
Merge branch 'next' into for-linus
Prepare second round of input updates for 4.18 merge window.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/input/mt.h | 2 | ||||
| -rw-r--r-- | include/linux/rmi.h | 2 |
2 files changed, 3 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); diff --git a/include/linux/rmi.h b/include/linux/rmi.h index 64125443f8a6..5ef5c7c412a7 100644 --- a/include/linux/rmi.h +++ b/include/linux/rmi.h @@ -354,6 +354,8 @@ struct rmi_driver_data { struct mutex irq_mutex; struct input_dev *input; + struct irq_domain *irqdomain; + u8 pdt_props; u8 num_rx_electrodes; |