diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 08:03:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 08:03:00 -0700 |
| commit | 1a5f20fe197f814fc0b29173894a706f478db821 (patch) | |
| tree | f09735a5265639f40f3cfb6e2187b4239c9ae3eb /drivers/input/keyboard/Kconfig | |
| parent | 55982d94009c8fb1ea79855dba0c079c36224c38 (diff) | |
| parent | 3267a87f9dc38d036571ff0880533d9ae8989f01 (diff) | |
| download | blackbird-op-linux-1a5f20fe197f814fc0b29173894a706f478db821.tar.gz blackbird-op-linux-1a5f20fe197f814fc0b29173894a706f478db821.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
MAINTAINERS - Add an entry for the input MT protocol
Input: wacom - fix serial number handling on Cintiq 21UX2
Input: fixup X86_MRST selects
Input: sysrq - fix "stuck" SysRq mode
Input: ad7877 - fix spi word size to 16 bit
Input: pcf8574_keypad - fix off by one in pcf8574_kp_irq_handler()
Diffstat (limited to 'drivers/input/keyboard/Kconfig')
| -rw-r--r-- | drivers/input/keyboard/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index d8fa5d724c57..0f9a4785d798 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig @@ -69,7 +69,7 @@ config KEYBOARD_ATARI module will be called atakbd. config KEYBOARD_ATKBD - tristate "AT keyboard" if EMBEDDED || !X86 + tristate "AT keyboard" if EMBEDDED || !X86 || X86_MRST default y select SERIO select SERIO_LIBPS2 |
