Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / drivers / input / serio / i8042-x86ia64io.h

diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index 2e8b0333fb43ba1016ff5b6977aedae4171be1ea..fe732a574ec2c5774d729248c1ba2a6e3470a00d 100644 (file)
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -68,6 +68,15 @@ static inline void i8042_write_command(int val)
 #include <linux/dmi.h>
 
 static struct dmi_system_id __initdata i8042_dmi_noloop_table[] = {
+       {
+               /* AUX LOOP command does not raise AUX IRQ */
+               .ident = "Arima-Rioworks HDAMB",
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "RIOWORKS"),
+                       DMI_MATCH(DMI_BOARD_NAME, "HDAMB"),
+                       DMI_MATCH(DMI_BOARD_VERSION, "Rev E"),
+               },
+       },
        {
                /* AUX LOOP command does not raise AUX IRQ */
                .ident = "ASUS P65UP5",
@@ -357,6 +366,13 @@ static struct dmi_system_id __initdata i8042_dmi_dritek_table[] = {
                        DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5680"),
                },
        },
+       {
+               .ident = "Acer Aspire 5720",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5720"),
+               },
+       },
        {
                .ident = "Acer Aspire 9110",
                .matches = {