linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] input: do not select i8042 for x86 mid
@ 2010-05-17 19:35 Jacob Pan
  2010-05-20 16:53 ` Dmitry Torokhov
  0 siblings, 1 reply; 2+ messages in thread
From: Jacob Pan @ 2010-05-17 19:35 UTC (permalink / raw)
  To: LKML, H. Peter Anvin, Ingo Molnar, Thomas Gleixner,
	Dmitry Torokhov, Alan Cox
  Cc: Jacob Pan, Jacob Pan

From: Jacob Pan <jacob.jun.pan@intel.com>

Moorestown does not have i8042 based keyboard controller, so give
an option to deselect i8042 for non-pc mid

Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
---
 drivers/input/keyboard/Kconfig |    2 +-
 drivers/input/mouse/Kconfig    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 64c1023..42aa650 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/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/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index c714ca2..eeb58c1 100644
--- a/drivers/input/mouse/Kconfig
+++ b/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
-- 
1.6.3.3


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] input: do not select i8042 for x86 mid
  2010-05-17 19:35 [PATCH] input: do not select i8042 for x86 mid Jacob Pan
@ 2010-05-20 16:53 ` Dmitry Torokhov
  0 siblings, 0 replies; 2+ messages in thread
From: Dmitry Torokhov @ 2010-05-20 16:53 UTC (permalink / raw)
  To: Jacob Pan
  Cc: LKML, H. Peter Anvin, Ingo Molnar, Thomas Gleixner, Alan Cox,
	Jacob Pan

On Mon, May 17, 2010 at 12:35:16PM -0700, Jacob Pan wrote:
> From: Jacob Pan <jacob.jun.pan@intel.com>
> 
> Moorestown does not have i8042 based keyboard controller, so give
> an option to deselect i8042 for non-pc mid
> 
> Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>

Applied, thanks Jacob.

-- 
Dmitry

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-05-20 16:53 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-17 19:35 [PATCH] input: do not select i8042 for x86 mid Jacob Pan
2010-05-20 16:53 ` Dmitry Torokhov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).