Merge commit 'v2.6.30-rc5' into next

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

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index ea2638b4198226dfc7d2d69c87a387eea1df1df6..54775aaa7be77c23482588407da2c26ad87b1a75 100644 (file)
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -332,4 +332,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