diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-12-03 02:38:13 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-12-03 02:38:13 -0500 |
commit | 467832032cc07626880363efa8625719c16c04eb (patch) | |
tree | ee9a62c04f0b3106e412bc1b2dd1cea5566d5ca7 /drivers/input/serio | |
parent | 66d2a5952eab875f1286e04f738ef029afdaf013 (diff) | |
parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) |
Merge commit 'v2.6.32' into next
Diffstat (limited to 'drivers/input/serio')
-rw-r--r-- | drivers/input/serio/i8042-x86ia64io.h | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index a537925f7651..2bcf1ace27c0 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h | |||
@@ -447,6 +447,27 @@ static struct dmi_system_id __initdata i8042_dmi_reset_table[] = { | |||
447 | DMI_MATCH(DMI_PRODUCT_NAME, "N10"), | 447 | DMI_MATCH(DMI_PRODUCT_NAME, "N10"), |
448 | }, | 448 | }, |
449 | }, | 449 | }, |
450 | { | ||
451 | .ident = "Dell Vostro 1320", | ||
452 | .matches = { | ||
453 | DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | ||
454 | DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 1320"), | ||
455 | }, | ||
456 | }, | ||
457 | { | ||
458 | .ident = "Dell Vostro 1520", | ||
459 | .matches = { | ||
460 | DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | ||
461 | DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 1520"), | ||
462 | }, | ||
463 | }, | ||
464 | { | ||
465 | .ident = "Dell Vostro 1720", | ||
466 | .matches = { | ||
467 | DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | ||
468 | DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 1720"), | ||
469 | }, | ||
470 | }, | ||
450 | { } | 471 | { } |
451 | }; | 472 | }; |
452 | 473 | ||