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

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

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 0c327621bd868653f063dce7f8ba25ca0ff500ed..8ea709be3306976244a35180b4ce15c2923a0cb0 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"