diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-07-06 13:51:43 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-07-06 13:51:43 -0700 |
| commit | ede2e7cdc58e1847cc73bd26b88a634631a43112 (patch) | |
| tree | f4582f9dc0f4ec8c06975017e036479805d77a4b /include/linux | |
| parent | 9768935264c4f0e4afd788a185d8e8d89c28e41d (diff) | |
| parent | 65938133784a3092c61b00aa63d1830fb465c1ac (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 4.13 merge window.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/input/sparse-keymap.h | 1 | ||||
| -rw-r--r-- | include/linux/platform_data/lm8323.h (renamed from include/linux/i2c/lm8323.h) | 0 | ||||
| -rw-r--r-- | include/linux/platform_data/mcs.h (renamed from include/linux/i2c/mcs.h) | 0 | ||||
| -rw-r--r-- | include/linux/platform_data/mms114.h (renamed from include/linux/i2c/mms114.h) | 0 | ||||
| -rw-r--r-- | include/linux/platform_data/tsc2007.h (renamed from include/linux/i2c/tsc2007.h) | 2 |
5 files changed, 1 insertions, 2 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); diff --git a/include/linux/i2c/lm8323.h b/include/linux/platform_data/lm8323.h index 478d668bc590..478d668bc590 100644 --- a/include/linux/i2c/lm8323.h +++ b/include/linux/platform_data/lm8323.h diff --git a/include/linux/i2c/mcs.h b/include/linux/platform_data/mcs.h index 61bb18a4fd3c..61bb18a4fd3c 100644 --- a/include/linux/i2c/mcs.h +++ b/include/linux/platform_data/mcs.h diff --git a/include/linux/i2c/mms114.h b/include/linux/platform_data/mms114.h index 5722ebfb2738..5722ebfb2738 100644 --- a/include/linux/i2c/mms114.h +++ b/include/linux/platform_data/mms114.h diff --git a/include/linux/i2c/tsc2007.h b/include/linux/platform_data/tsc2007.h index 4f35b6ad3889..c2d3aa1dadd4 100644 --- a/include/linux/i2c/tsc2007.h +++ b/include/linux/platform_data/tsc2007.h @@ -1,7 +1,7 @@ #ifndef __LINUX_I2C_TSC2007_H #define __LINUX_I2C_TSC2007_H -/* linux/i2c/tsc2007.h */ +/* linux/platform_data/tsc2007.h */ struct tsc2007_platform_data { u16 model; /* 2007. */ |