From 5049d957886e4a9f602f9b7873a10f055e508591 Mon Sep 17 00:00:00 2001 From: Jacob Pan Date: Wed, 19 May 2010 10:11:14 -0700 Subject: [PATCH] --- yaml --- r: 193539 b: refs/heads/master c: 685afae02557a178185a4be36f58332976e79f63 h: refs/heads/master i: 193537: dd73ecf68a688c5c8f35c150f0a615977e3cfdfa 193535: e2bc90748aa2eede4fb05a2b05f5182c2019b011 v: v3 --- [refs] | 2 +- trunk/drivers/input/keyboard/Kconfig | 2 +- trunk/drivers/input/mouse/Kconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 81c36b8c03f2..72695edb739e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2056ffd4ae9e578ff9abb5eb49137020af71fd4 +refs/heads/master: 685afae02557a178185a4be36f58332976e79f63 diff --git a/trunk/drivers/input/keyboard/Kconfig b/trunk/drivers/input/keyboard/Kconfig index 3525f533e186..d8fa5d724c57 100644 --- a/trunk/drivers/input/keyboard/Kconfig +++ b/trunk/drivers/input/keyboard/Kconfig @@ -73,7 +73,7 @@ config KEYBOARD_ATKBD default y select SERIO select SERIO_LIBPS2 - select SERIO_I8042 if X86 + select SERIO_I8042 if X86 && !X86_MRST select SERIO_GSCPS2 if GSC help Say Y here if you want to use a standard AT or PS/2 keyboard. Usually diff --git a/trunk/drivers/input/mouse/Kconfig b/trunk/drivers/input/mouse/Kconfig index c714ca2407f8..eeb58c1cac16 100644 --- a/trunk/drivers/input/mouse/Kconfig +++ b/trunk/drivers/input/mouse/Kconfig @@ -17,7 +17,7 @@ config MOUSE_PS2 default y select SERIO select SERIO_LIBPS2 - select SERIO_I8042 if X86 + select SERIO_I8042 if X86 && !X86_MRST select SERIO_GSCPS2 if GSC help Say Y here if you have a PS/2 mouse connected to your system. This