diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-07-06 22:51:43 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-07-06 22:51:43 +0200 |
| commit | ede2e7cdc58e1847cc73bd26b88a634631a43112 (patch) | |
| tree | f4582f9dc0f4ec8c06975017e036479805d77a4b /drivers/input/keyboard/mcs_touchkey.c | |
| parent | Input: synaptics-rmi4 - only read the F54 query registers which are used (diff) | |
| parent | MAINTAINERS: update input subsystem patterns (diff) | |
| download | linux-ede2e7cdc58e1847cc73bd26b88a634631a43112.tar.xz linux-ede2e7cdc58e1847cc73bd26b88a634631a43112.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 4.13 merge window.
Diffstat (limited to 'drivers/input/keyboard/mcs_touchkey.c')
| -rw-r--r-- | drivers/input/keyboard/mcs_touchkey.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/mcs_touchkey.c b/drivers/input/keyboard/mcs_touchkey.c index 31090d71a685..be56d4f262a7 100644 --- a/drivers/input/keyboard/mcs_touchkey.c +++ b/drivers/input/keyboard/mcs_touchkey.c @@ -13,11 +13,11 @@ #include <linux/module.h> #include <linux/i2c.h> -#include <linux/i2c/mcs.h> #include <linux/interrupt.h> #include <linux/input.h> #include <linux/irq.h> #include <linux/slab.h> +#include <linux/platform_data/mcs.h> #include <linux/pm.h> /* MCS5000 Touchkey */ |