From 11c116d0ff1ef9cbc8750052954999953755bd3c Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dtor@insightbb.com>
Date: Fri, 16 Mar 2007 00:59:42 -0400
Subject: [PATCH] --- yaml --- r: 53405 b: refs/heads/master c:
 6e782584e0713ea89da151333e7fe754c8f40324 h: refs/heads/master i:   53403:
 5360ebd703e91a434f9f56dd096269aa18e80c6c v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/input/serio/i8042-x86ia64io.h | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2f3bf1d4d9c1..46599ce70f20 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9575499dfebc0f0fbbf122223f02e9e92630661d
+refs/heads/master: 6e782584e0713ea89da151333e7fe754c8f40324
diff --git a/trunk/drivers/input/serio/i8042-x86ia64io.h b/trunk/drivers/input/serio/i8042-x86ia64io.h
index d36bd5475b6d..5c007d44e06e 100644
--- a/trunk/drivers/input/serio/i8042-x86ia64io.h
+++ b/trunk/drivers/input/serio/i8042-x86ia64io.h
@@ -159,6 +159,17 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = {
 			DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK E4010"),
 		},
 	},
+	{
+		/*
+		 * Errors on MUX ports are reported without raising AUXDATA
+		 * causing "spurious NAK" messages.
+		 */
+		.ident = "HP Pavilion DV4017EA",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "Pavilion dv4000 (EA032EA#ABF)"),
+		},
+	},
 	{
 		.ident = "Toshiba P10",
 		.matches = {