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

[linux-2.6-block.git] / drivers / input / misc / Kconfig

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 79d0be9885c575433dc6db7a146e253672d3d441..3872488c3fd7b9766c852a752dfcc3742efc9532 100644 (file)
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -316,6 +316,16 @@ config INPUT_COBALT_BTNS
          To compile this driver as a module, choose M here: the
          module will be called cobalt_btns.
 
+config INPUT_CPCAP_PWRBUTTON
+       tristate "CPCAP OnKey"
+       depends on MFD_CPCAP
+       help
+         Say Y here if you want to enable power key reporting via the
+         Motorola CPCAP chip.
+
+         To compile this driver as a module, choose M here. The module will
+         be called cpcap-pwrbutton.
+
 config INPUT_WISTRON_BTNS
        tristate "x86 Wistron laptop button interface"
        depends on X86_32