aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-08-31 23:42:51 -0400
committerLen Brown <len.brown@intel.com>2009-08-31 23:42:51 -0400
commit8aeb0a352af7eb26863e53c203eeb852fd4590c3 (patch)
tree30f1117830a721cb803f34fa8041b203b539e9ac
parent7e24bc1ce669b2876ffa475ea1147f2bb9ffdc52 (diff)
parenteb0ca849863ecdc593ba7faa95fda5695af891c8 (diff)
Merge branch 'bugzilla-13745' into release
-rw-r--r--drivers/acpi/sleep.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 42159a28f433..e0a74097a978 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -405,6 +405,14 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
405 }, 405 },
406 }, 406 },
407 { 407 {
408 .callback = init_set_sci_en_on_resume,
409 .ident = "Hewlett-Packard HP Pavilion dv3 Notebook PC",
410 .matches = {
411 DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
412 DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv3 Notebook PC"),
413 },
414 },
415 {
408 .callback = init_old_suspend_ordering, 416 .callback = init_old_suspend_ordering,
409 .ident = "Panasonic CF51-2L", 417 .ident = "Panasonic CF51-2L",
410 .matches = { 418 .matches = {