diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-06-22 18:26:29 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-06-22 18:26:29 +0200 |
| commit | f7ebc4dcdeb1be7209d94a8c0dc602ab24e36ae1 (patch) | |
| tree | 650c1748df35728e2bce1b8c26c064bfea272f63 /drivers/input/misc/Makefile | |
| parent | Input: pixcir_i2c_ts - fix receive error (diff) | |
| parent | MAINTAINERS: remove non existent input mt git tree (diff) | |
| download | linux-f7ebc4dcdeb1be7209d94a8c0dc602ab24e36ae1.tar.xz linux-f7ebc4dcdeb1be7209d94a8c0dc602ab24e36ae1.zip | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 4.2 merge window.
Diffstat (limited to 'drivers/input/misc/Makefile')
| -rw-r--r-- | drivers/input/misc/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile index 78ba4c1b8532..53df07dcc23c 100644 --- a/drivers/input/misc/Makefile +++ b/drivers/input/misc/Makefile @@ -25,9 +25,11 @@ obj-$(CONFIG_INPUT_CMA3000_I2C) += cma3000_d0x_i2c.o obj-$(CONFIG_INPUT_COBALT_BTNS) += cobalt_btns.o obj-$(CONFIG_INPUT_DA9052_ONKEY) += da9052_onkey.o obj-$(CONFIG_INPUT_DA9055_ONKEY) += da9055_onkey.o +obj-$(CONFIG_INPUT_DA9063_ONKEY) += da9063_onkey.o obj-$(CONFIG_INPUT_DM355EVM) += dm355evm_keys.o obj-$(CONFIG_INPUT_E3X0_BUTTON) += e3x0-button.o obj-$(CONFIG_INPUT_DRV260X_HAPTICS) += drv260x.o +obj-$(CONFIG_INPUT_DRV2665_HAPTICS) += drv2665.o obj-$(CONFIG_INPUT_DRV2667_HAPTICS) += drv2667.o obj-$(CONFIG_INPUT_GP2A) += gp2ap002a00f.o obj-$(CONFIG_INPUT_GPIO_BEEPER) += gpio-beeper.o |