diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-06-13 01:24:36 +0200 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-06-13 01:24:36 +0200 |
commit | 01f7e67a053f7f5696fbdefe2b066303469b6db5 (patch) | |
tree | aebc19aad8327cd0408de71d0621fea43589ed75 /drivers/input/misc/Makefile | |
parent | Input: silead - add MSSL0002 ACPI HID (diff) | |
parent | Input: do not assign new tracking ID when changing tool type (diff) | |
download | linux-01f7e67a053f7f5696fbdefe2b066303469b6db5.tar.xz linux-01f7e67a053f7f5696fbdefe2b066303469b6db5.zip |
Merge branch 'next' into for-linus
Prepare second round of input updates for 4.18 merge window.
Diffstat (limited to 'drivers/input/misc/Makefile')
-rw-r--r-- | drivers/input/misc/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile index 72cde28649e2..9d0f9d1ff68f 100644 --- a/drivers/input/misc/Makefile +++ b/drivers/input/misc/Makefile @@ -66,6 +66,7 @@ obj-$(CONFIG_INPUT_RETU_PWRBUTTON) += retu-pwrbutton.o obj-$(CONFIG_INPUT_AXP20X_PEK) += axp20x-pek.o obj-$(CONFIG_INPUT_GPIO_ROTARY_ENCODER) += rotary_encoder.o obj-$(CONFIG_INPUT_RK805_PWRKEY) += rk805-pwrkey.o +obj-$(CONFIG_INPUT_SC27XX_VIBRA) += sc27xx-vibra.o obj-$(CONFIG_INPUT_SGI_BTNS) += sgi_btns.o obj-$(CONFIG_INPUT_SIRFSOC_ONKEY) += sirfsoc-onkey.o obj-$(CONFIG_INPUT_SOC_BUTTON_ARRAY) += soc_button_array.o |