diff options
| author | Mark Brown <broonie@kernel.org> | 2017-10-19 19:45:49 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-10-19 19:45:49 +0100 |
| commit | c23fed1d9173bf85b0fca069c2f24771e2d4e546 (patch) | |
| tree | 8c0cddaea87050ba51cc209a2332ac03e3e3fabc /include/linux/input.h | |
| parent | 2bd6bf03f4c1c59381d62c61d03f6cc3fe71f66e (diff) | |
| parent | f674bd281460451e8784f3bc917a650e8937a8ed (diff) | |
Merge branch 'linus-4.14-rc4-acp-prereq' of git://people.freedesktop.org/~agd5f/linux into asoc-amd
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 *)); |