Merge branch 'for-2.6.31' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

[mv-sheeva.git] / drivers / input / keyboard / Kconfig

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index ea2638b4198226dfc7d2d69c87a387eea1df1df6..9d8f796c6745291f3bd5bccf3a52177c3583c06f 100644 (file)
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -250,6 +250,17 @@ config KEYBOARD_HP7XX
          To compile this driver as a module, choose M here: the
          module will be called jornada720_kbd.
 
+config KEYBOARD_LM8323
+       tristate "LM8323 keypad chip"
+       depends on I2C
+       depends on LEDS_CLASS
+       help
+         If you say yes here you get support for the National Semiconductor
+         LM8323 keypad controller.
+
+         To compile this driver as a module, choose M here: the
+         module will be called lm8323.
+
 config KEYBOARD_OMAP
        tristate "TI OMAP keypad support"
        depends on (ARCH_OMAP1 || ARCH_OMAP2)
@@ -332,4 +343,14 @@ config KEYBOARD_SH_KEYSC
 
          To compile this driver as a module, choose M here: the
          module will be called sh_keysc.
+
+config KEYBOARD_EP93XX
+       tristate "EP93xx Matrix Keypad support"
+       depends on ARCH_EP93XX
+       help
+         Say Y here to enable the matrix keypad on the Cirrus EP93XX.
+
+         To compile this driver as a module, choose M here: the
+         module will be called ep93xx_keypad.
+
 endif