aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor@insightbb.com>2007-06-28 00:44:27 -0400
committerDmitry Torokhov <dtor@insightbb.com>2007-06-28 00:44:27 -0400
commit9d9d50bb2efb50594abfc3941a5504b62c514ebd (patch)
tree8e9582d94029a87317d0f8315adc3b442dab437c /drivers/input
parent893e7c2db05f14032f2390ef7c59a499fc25ccae (diff)
Input: i8042 - add HP Pavilion ZT1000 to the MUX blacklist
This should get rid of "atkbd.c: Suprious NAK on isa0060/serio0" messages caused by broken MUX implementation. The box does not have external PS/2 ports and, according to documentation, automatically disables touchpad when an external mouse is plugged into a port replicator, so MUX mode would not work anyway. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/serio/i8042-x86ia64io.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index f4a2517925e4..4fca1e7f2678 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -200,6 +200,17 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = {
200 }, 200 },
201 }, 201 },
202 { 202 {
203 /*
204 * Like DV4017EA does not raise AUXERR for errors on MUX ports.
205 */
206 .ident = "HP Pavilion ZT1000",
207 .matches = {
208 DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
209 DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion Notebook PC"),
210 DMI_MATCH(DMI_PRODUCT_VERSION, "HP Pavilion Notebook ZT1000"),
211 },
212 },
213 {
203 .ident = "Toshiba P10", 214 .ident = "Toshiba P10",
204 .matches = { 215 .matches = {
205 DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), 216 DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),