summaryrefslogtreecommitdiffstats
path: root/drivers/input/serio/i8042-x86ia64io.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2008-12-30 10:10:06 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2008-12-30 10:10:06 +0100
commit1dd3294677d5484e4813c6c454ba7f192a3ef61d (patch)
treee29306ffe8b709a7499a25ecbe3234f833fc7002 /drivers/input/serio/i8042-x86ia64io.h
parentLinux 2.6.28 (diff)
parentInput: gtco - use USB endpoint API (diff)
downloadlinux-1dd3294677d5484e4813c6c454ba7f192a3ef61d.tar.xz
linux-1dd3294677d5484e4813c6c454ba7f192a3ef61d.zip
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 29e686388a2c..e196bf246f30 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"),
+ },
+ },
{ }
};