From 9ba52a9dc7e54eb9c0ebc48787b9dde735db3ec4 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Thu, 17 Jun 2010 22:31:17 -0700 Subject: [PATCH] --- yaml --- r: 200491 b: refs/heads/master c: 0b28bac5aef7bd1ab213723df031e61db9ff151a h: refs/heads/master i: 200489: 339c0ef6f7d70c605452c9057dc7100e8b3b3c6b 200487: b5368c860604a852b407b9cf772efdb86890c367 v: v3 --- [refs] | 2 +- trunk/drivers/input/keyboard/Kconfig | 2 +- trunk/drivers/input/serio/Kconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f77a6e66c37f..9fe5df4de89e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e789314f8c0b50bd19bf08dc5624b9604d60183 +refs/heads/master: 0b28bac5aef7bd1ab213723df031e61db9ff151a diff --git a/trunk/drivers/input/keyboard/Kconfig b/trunk/drivers/input/keyboard/Kconfig index d8fa5d724c57..0f9a4785d798 100644 --- a/trunk/drivers/input/keyboard/Kconfig +++ b/trunk/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 diff --git a/trunk/drivers/input/serio/Kconfig b/trunk/drivers/input/serio/Kconfig index 3bfe8fafc6ad..256b9e9394dc 100644 --- a/trunk/drivers/input/serio/Kconfig +++ b/trunk/drivers/input/serio/Kconfig @@ -22,7 +22,7 @@ config SERIO_I8042 tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86 default y depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && \ - (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN + (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN && !X86_MRST 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,