NVMe: don't try to read csts when failing to reset it

[firefly-linux-kernel-4.4.55.git] / drivers / input / Kconfig

diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 47a5143096e4a473b6a25284c7c596baf8c80b04..c71fde46e9e93c9e0afcf6ae89fd149ad053e532 100644 (file)
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -188,13 +188,17 @@ config INPUT_APMPOWER
          module will be called apm-power.
 
 config INPUT_KEYRESET
-       tristate "Reset key"
+       bool "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
+       bool "Key combo"
+       depends on INPUT
+       ---help---
+         Say Y here if you want to take action when some keys are pressed;
 
 comment "Input Device Drivers"
 
@@ -208,6 +212,10 @@ source "drivers/input/tablet/Kconfig"
 
 source "drivers/input/touchscreen/Kconfig"
 
+source "drivers/input/remotectl/Kconfig"
+
+source "drivers/input/sensors/Kconfig"
+
 source "drivers/input/misc/Kconfig"
 
 endif