diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-09 09:11:09 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-09 09:11:09 +0200 |
| commit | 4fcae770f3027abefd952c5d511ac6299828865a (patch) | |
| tree | 6cf64399a20f989358831a8f9b2ac2bb19628f54 /include/linux/input.h | |
| parent | usb: host: xhci-plat: Use of_device_get_match_data() helper (diff) | |
| parent | Linux 4.14-rc4 (diff) | |
Merge 4.14-rc4 into usb-next
This merges in the USB fixes that we need here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/input.h')
| -rw-r--r-- | include/linux/input.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/input.h b/include/linux/input.h index a65e3b24fb18..fb5e23c7ed98 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -529,6 +529,7 @@ int input_ff_event(struct input_dev *dev, unsigned int type, unsigned int code, int input_ff_upload(struct input_dev *dev, struct ff_effect *effect, struct file *file); int input_ff_erase(struct input_dev *dev, int effect_id, struct file *file); +int input_ff_flush(struct input_dev *dev, struct file *file); int input_ff_create_memless(struct input_dev *dev, void *data, int (*play_effect)(struct input_dev *, void *, struct ff_effect *)); |