summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2004-10-31 00:05:26 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-10-31 00:05:26 -0800
commit35f6b05ab9111f81a00eae9ab6c646d0b4856106 (patch)
tree1b7a87feb1b78bc9d00724c5212ce46b67993143 /drivers/input
parent741fb040f996169f7ea26f88b3032b52003c5145 (diff)
[PATCH] m68k: Disable SERIO_I8042
M68k: Disable SERIO_I8042 Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/serio/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index db1a8ce4390f..d9addd82043a 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 || FOOTBRIDGE_HOST)
+ depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && !M68K
---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,