diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-04-08 03:00:33 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-04-08 03:00:33 -0400 |
| commit | ba28f22e7cf16cb310bb491cbb3f7d0d5d1f5c5d (patch) | |
| tree | 6d58e91731385281436da191e82c56cd1627482f /drivers/input/serio | |
| parent | 577c9c456f0e1371cbade38eaf91ae8e8a308555 (diff) | |
| parent | 59cc1dd97ca9ac0363ef2f770901fbd86e2b970a (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/i8042-x86ia64io.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index 6fa2deff7446..83ed2d56b924 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h | |||
| @@ -151,6 +151,14 @@ static struct dmi_system_id __initdata i8042_dmi_noloop_table[] = { | |||
| 151 | DMI_MATCH(DMI_PRODUCT_VERSION, "01"), | 151 | DMI_MATCH(DMI_PRODUCT_VERSION, "01"), |
| 152 | }, | 152 | }, |
| 153 | }, | 153 | }, |
| 154 | { | ||
| 155 | .ident = "HP DV9700", | ||
| 156 | .matches = { | ||
| 157 | DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), | ||
| 158 | DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv9700"), | ||
| 159 | DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"), | ||
| 160 | }, | ||
| 161 | }, | ||
| 154 | { } | 162 | { } |
| 155 | }; | 163 | }; |
| 156 | 164 | ||