summaryrefslogtreecommitdiff
path: root/drivers/input/serio/i8042-x86ia64io.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2008-12-30 09:10:06 (GMT)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2008-12-30 09:10:06 (GMT)
commit1dd3294677d5484e4813c6c454ba7f192a3ef61d (patch)
treee29306ffe8b709a7499a25ecbe3234f833fc7002 /drivers/input/serio/i8042-x86ia64io.h
parent4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff)
parente941da3110422c4e57c3d05759fb9475b28f45f6 (diff)
downloadlinux-fsl-qoriq-1dd3294677d5484e4813c6c454ba7f192a3ef61d.tar.xz
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/serio/i8042-x86ia64io.h')
-rw-r--r--drivers/input/serio/i8042-x86ia64io.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index 29e6863..e196bf2 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -143,6 +143,14 @@ static struct dmi_system_id __initdata i8042_dmi_noloop_table[] = {
DMI_MATCH(DMI_PRODUCT_VERSION, "M606"),
},
},
+ {
+ .ident = "Gigabyte M912",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "M912"),
+ DMI_MATCH(DMI_PRODUCT_VERSION, "01"),
+ },
+ },
{ }
};