Merge tag 'v3.10.86' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / input / Kconfig

diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 38b523a1ece0634e7855b5eae62b94b6fe7fd160..518efa2a9f526d874c837b78eeffe21160aa03de 100644 (file)
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -80,7 +80,7 @@ config INPUT_MATRIXKMAP
 comment "Userland interfaces"
 
 config INPUT_MOUSEDEV
-       tristate "Mouse interface" if EXPERT
+       tristate "Mouse interface"
        default y
        help
          Say Y here if you want your mouse to be accessible as char devices
@@ -174,6 +174,25 @@ config INPUT_APMPOWER
          To compile this driver as a module, choose M here: the
          module will be called apm-power.
 
+config INPUT_KEYRESET
+       tristate "Reset key"
+       depends on INPUT
+       select INPUT_KEYCOMBO
+       ---help---
+         Say Y here if you want to reboot when some keys are pressed;
+
+         To compile this driver as a module, choose M here: the
+         module will be called keyreset.
+
+config INPUT_KEYCOMBO
+       tristate "Key combo"
+       depends on INPUT
+       ---help---
+         Say Y here if you want to take action when some keys are pressed;
+
+         To compile this driver as a module, choose M here: the
+         module will be called keycombo.
+
 comment "Input Device Drivers"
 
 source "drivers/input/keyboard/Kconfig"