summaryrefslogtreecommitdiffstats
path: root/drivers/input/misc/Kconfig
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2019-05-10 11:40:35 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2019-05-10 11:40:35 -0700
commit14e0c7317ed58bcd15af5c3d09818ee0f2e3984c (patch)
treef9b63dc681574484c23c6b01be81f17cf9c64d6a /drivers/input/misc/Kconfig
parent3a349763cf11e63534b8f2d302f2d0c790566497 (diff)
parent0981949da8f7498b96c6e0ae60680865ca283bf1 (diff)
downloadlinux-14e0c7317ed58bcd15af5c3d09818ee0f2e3984c.tar.gz
linux-14e0c7317ed58bcd15af5c3d09818ee0f2e3984c.tar.bz2
linux-14e0c7317ed58bcd15af5c3d09818ee0f2e3984c.zip
Merge branch 'next' into for-linus
Prepare input updates for 5.2 merge window.
Diffstat (limited to 'drivers/input/misc/Kconfig')
-rw-r--r--drivers/input/misc/Kconfig12
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index e39aef84f357..16f41eece6d2 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -290,6 +290,18 @@ config INPUT_GPIO_DECODER
To compile this driver as a module, choose M here: the module
will be called gpio_decoder.
+config INPUT_GPIO_VIBRA
+ tristate "GPIO vibrator support"
+ depends on GPIOLIB || COMPILE_TEST
+ select INPUT_FF_MEMLESS
+ help
+ Say Y here to get support for GPIO based vibrator devices.
+
+ If unsure, say N.
+
+ To compile this driver as a module, choose M here: the module will be
+ called gpio-vibra.
+
config INPUT_IXP4XX_BEEPER
tristate "IXP4XX Beeper support"
depends on ARCH_IXP4XX