diff options
| author | Dmitry Torokhov | 2008-02-06 06:54:05 +0100 |
|---|---|---|
| committer | Dmitry Torokhov | 2008-02-06 06:54:05 +0100 |
| commit | 03366e7b9bf1544cb0b98f1a5cd6d340654f486a (patch) | |
| tree | b9ca15f0acd86f90fdd62c1ab4b3e8e9b4592fd6 /drivers/input/keyboard/Kconfig | |
| parent | Input: i8042 - non-x86 build fix (diff) | |
| parent | Input: pxa27x_keypad - also enable on PXA3xx (diff) | |
| download | kernel-qcow2-linux-03366e7b9bf1544cb0b98f1a5cd6d340654f486a.tar.gz kernel-qcow2-linux-03366e7b9bf1544cb0b98f1a5cd6d340654f486a.tar.xz kernel-qcow2-linux-03366e7b9bf1544cb0b98f1a5cd6d340654f486a.zip | |
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 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" |