diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 13:31:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 13:31:34 -0800 |
| commit | d43a338e395371733a80ec473b40baac5f74d768 (patch) | |
| tree | d4c01b62865bed1af2463d7a4eb4cb25ca46c66e /drivers/input/keyboard/Kconfig | |
| parent | cb4aaf46c0283dd79ab2e8b8b165c0bf13ab6194 (diff) | |
| parent | 62b529a7b9c11880a8820494a25db0e2ecdf3bed (diff) | |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input:
Input: remove obsolete setup parameters from input drivers
Input: HIL - fix improper call to release_region()
Input: hid-lgff - treat devices as joysticks unless told otherwise
Input: HID - add support for Logitech Formula Force EX
Input: gpio-keys - switch to common GPIO API
Input: do not lock device when showing name, phys and uniq
Input: i8042 - let serio bus suspend ports
Input: psmouse - properly reset mouse on shutdown/suspend
Diffstat (limited to 'drivers/input/keyboard/Kconfig')
| -rw-r--r-- | drivers/input/keyboard/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index 1b81a72e19d..64509689fa6 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig @@ -215,11 +215,11 @@ config KEYBOARD_AAED2000 module will be called aaed2000_kbd. config KEYBOARD_GPIO - tristate "Buttons on CPU GPIOs (PXA)" - depends on ARCH_PXA + tristate "Buttons on CPU GPIOs (PXA)" + depends on (ARCH_SA1100 || ARCH_PXA || ARCH_S3C2410) help This driver implements support for buttons connected - directly to GPIO pins of PXA CPUs. + directly to GPIO pins of SA1100, PXA or S3C24xx CPUs. Say Y here if your device has buttons connected directly to GPIO pins of the CPU. |