Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[~andy/linux] / drivers / input / misc / Kconfig

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 0b541cdf9b8e69f238c2f7fcd5eadebe644ec3e3..aa51baaa9b1ec273acc95c7edcb838ed81fe5fe2 100644 (file)
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -647,4 +647,14 @@ config INPUT_SIRFSOC_ONKEY
 
          If unsure, say N.
 
+config INPUT_IDEAPAD_SLIDEBAR
+       tristate "IdeaPad Laptop Slidebar"
+       depends on INPUT
+       depends on SERIO_I8042
+       help
+         Say Y here if you have an IdeaPad laptop with a slidebar.
+
+         To compile this driver as a module, choose M here: the
+         module will be called ideapad_slidebar.
+
 endif