Skip to content

L
linux
Commit 02ab40ff authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk 

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 6e58ddeb b4fbf245
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
drivers/input/serio/Kconfig
View file @ 02ab40ff
...@@ -20,7 +20,7 @@ config SERIO_I8042 ...@@ -20,7 +20,7 @@ config SERIO_I8042
tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86 tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86
default y default y
select SERIO select SERIO
depends on !PARISC && (!ARM || ARCH_SHARK || ARCH_EBSA285) depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST)
---help--- ---help---
i8042 is the chip over which the standard AT keyboard and PS/2 i8042 is the chip over which the standard AT keyboard and PS/2
mouse are connected to the computer. If you use these devices, mouse are connected to the computer. If you use these devices,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7