diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-09-18 06:30:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-09-18 06:30:01 -0700 |
| commit | 02ab40ff1c41d9e507d7f80682f33e5efc3e9ad9 (patch) | |
| tree | a4c8a1bb00460b31ae03b18dbd6e0d4468ecffa1 /drivers/input | |
| parent | 6e58ddeb3e1a450d7b12cbbe3ab04ab931dd802d (diff) | |
| parent | b4fbf245ee2239e98346b18fa8bd2a176cf5e4ae (diff) | |
Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/serio/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig index 93761f817d0e..db1a8ce4390f 100644 --- a/drivers/input/serio/Kconfig +++ b/drivers/input/serio/Kconfig @@ -20,7 +20,7 @@ config SERIO_I8042 tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86 default y select SERIO - depends on !PARISC && (!ARM || ARCH_SHARK || ARCH_EBSA285) + depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) ---help--- i8042 is the chip over which the standard AT keyboard and PS/2 mouse are connected to the computer. If you use these devices, |