diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-02-06 00:54:05 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-02-06 00:54:05 -0500 |
| commit | 03366e7b9bf1544cb0b98f1a5cd6d340654f486a (patch) | |
| tree | b9ca15f0acd86f90fdd62c1ab4b3e8e9b4592fd6 /drivers/input/keyboard/Kconfig | |
| parent | c18bab80d16f04db3e263cc97522d21693cad2ce (diff) | |
| parent | e0f2677f0d21cfff9d45160343e6246417e55d02 (diff) | |
Merge branch 'pxa-keypad'
Diffstat (limited to 'drivers/input/keyboard/Kconfig')
| -rw-r--r-- | drivers/input/keyboard/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index 0c327621bd86..8ea709be3306 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig | |||
| @@ -260,13 +260,13 @@ config KEYBOARD_OMAP | |||
| 260 | module will be called omap-keypad. | 260 | module will be called omap-keypad. |
| 261 | 261 | ||
| 262 | config KEYBOARD_PXA27x | 262 | config KEYBOARD_PXA27x |
| 263 | tristate "PXA27x keyboard support" | 263 | tristate "PXA27x/PXA3xx keypad support" |
| 264 | depends on PXA27x | 264 | depends on PXA27x || PXA3xx |
| 265 | help | 265 | help |
| 266 | Enable support for PXA27x matrix keyboard controller | 266 | Enable support for PXA27x/PXA3xx keypad controller |
| 267 | 267 | ||
| 268 | To compile this driver as a module, choose M here: the | 268 | To compile this driver as a module, choose M here: the |
| 269 | module will be called pxa27x_keyboard. | 269 | module will be called pxa27x_keypad. |
| 270 | 270 | ||
| 271 | config KEYBOARD_AAED2000 | 271 | config KEYBOARD_AAED2000 |
| 272 | tristate "AAED-2000 keyboard" | 272 | tristate "AAED-2000 keyboard" |