Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit

[cascardo/linux.git] / drivers / input / keyboard / Kconfig

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index a89ba7c..106fbac 100644 (file)
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -588,6 +588,16 @@ config KEYBOARD_DAVINCI
          To compile this driver as a module, choose M here: the
          module will be called davinci_keyscan.
 
+config KEYBOARD_IPAQ_MICRO
+       tristate "Buttons on Micro SoC (iPaq h3100,h3600,h3700)"
+       depends on MFD_IPAQ_MICRO
+       help
+         Say Y to enable support for the buttons attached to
+         Micro peripheral controller on iPAQ h3100/h3600/h3700
+
+         To compile this driver as a module, choose M here: the
+         module will be called ipaq-micro-keys.
+
 config KEYBOARD_OMAP
        tristate "TI OMAP keypad support"
        depends on ARCH_OMAP1
@@ -686,4 +696,15 @@ config KEYBOARD_CAP11XX
          To compile this driver as a module, choose M here: the
          module will be called cap11xx.
 
+config KEYBOARD_BCM
+       tristate "Broadcom keypad driver"
+       depends on OF && HAVE_CLK
+       select INPUT_MATRIXKMAP
+       default ARCH_BCM_CYGNUS
+       help
+         Say Y here if you want to use Broadcom keypad.
+
+         To compile this driver as a module, choose M here: the
+         module will be called bcm-keypad.
+
 endif