Merge git://git.infradead.org/mtd-2.6

[linux-2.6] / drivers / input / keyboard / Kconfig

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 0c327621bd868653f063dce7f8ba25ca0ff500ed..efd70a9745910bfacd97e39b4fdebe451fa14ca4 100644 (file)
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -260,13 +260,13 @@ config KEYBOARD_OMAP
          module will be called omap-keypad.
 
 config KEYBOARD_PXA27x
-       tristate "PXA27x keyboard support"
-       depends on PXA27x
+       tristate "PXA27x/PXA3xx keypad support"
+       depends on PXA27x || PXA3xx
        help
-         Enable support for PXA27x matrix keyboard controller
+         Enable support for PXA27x/PXA3xx keypad controller
 
          To compile this driver as a module, choose M here: the
-         module will be called pxa27x_keyboard.
+         module will be called pxa27x_keypad.
 
 config KEYBOARD_AAED2000
        tristate "AAED-2000 keyboard"
@@ -314,4 +314,13 @@ config KEYBOARD_BFIN
          To compile this driver as a module, choose M here: the
          module will be called bf54x-keys.
 
+config KEYBOARD_SH_KEYSC
+       tristate "SuperH KEYSC keypad support"
+       depends on SUPERH
+       help
+         Say Y here if you want to use a keypad attached to the KEYSC block
+         on SuperH processors such as sh7722 and sh7343.
+
+         To compile this driver as a module, choose M here: the
+         module will be called sh_keysc.
 endif