diff options
| author | Sean Paul <seanpaul@chromium.org> | 2017-08-14 20:14:36 +0300 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2017-08-14 20:14:36 +0300 |
| commit | 1724c7c0c9494dcbdd7f630f29e1e8427cb231d1 (patch) | |
| tree | d7c7ad032289cdf0633feee4bd6ec5800b666ca7 /include/linux/input | |
| parent | 7f5d6dac548b983702dd7aac1d463bd88dff50a8 (diff) | |
| parent | ef954844c7ace62f773f4f23e28d2d915adc419f (diff) | |
| download | linux-1724c7c0c9494dcbdd7f630f29e1e8427cb231d1.tar.xz | |
Merge origin/master into drm-misc-fixes
Backmerge 4.13-rc5 into drm-misc-fixes, it was getting a
little stale.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'include/linux/input')
| -rw-r--r-- | include/linux/input/sparse-keymap.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/input/sparse-keymap.h b/include/linux/input/sparse-keymap.h index 52db62064c6e..c7346e33d958 100644 --- a/include/linux/input/sparse-keymap.h +++ b/include/linux/input/sparse-keymap.h @@ -51,7 +51,6 @@ struct key_entry *sparse_keymap_entry_from_keycode(struct input_dev *dev, int sparse_keymap_setup(struct input_dev *dev, const struct key_entry *keymap, int (*setup)(struct input_dev *, struct key_entry *)); -void sparse_keymap_free(struct input_dev *dev); void sparse_keymap_report_entry(struct input_dev *dev, const struct key_entry *ke, unsigned int value, bool autorelease); |