diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-07-06 23:51:43 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-07-06 23:51:43 +0300 |
| commit | ede2e7cdc58e1847cc73bd26b88a634631a43112 (patch) | |
| tree | f4582f9dc0f4ec8c06975017e036479805d77a4b /include/linux/input | |
| parent | 9768935264c4f0e4afd788a185d8e8d89c28e41d (diff) | |
| parent | 65938133784a3092c61b00aa63d1830fb465c1ac (diff) | |
| download | linux-ede2e7cdc58e1847cc73bd26b88a634631a43112.tar.xz | |
Merge branch 'next' into for-linus
Prepare input updates for 4.13 merge window.
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); |