diff options
| author | Len Brown <len.brown@intel.com> | 2009-08-31 23:42:51 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-08-31 23:42:51 -0400 |
| commit | 8aeb0a352af7eb26863e53c203eeb852fd4590c3 (patch) | |
| tree | 30f1117830a721cb803f34fa8041b203b539e9ac /drivers/acpi | |
| parent | 7e24bc1ce669b2876ffa475ea1147f2bb9ffdc52 (diff) | |
| parent | eb0ca849863ecdc593ba7faa95fda5695af891c8 (diff) | |
Merge branch 'bugzilla-13745' into release
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/sleep.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 42159a28f43..e0a74097a97 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -405,6 +405,14 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { }, }, { + .callback = init_set_sci_en_on_resume, + .ident = "Hewlett-Packard HP Pavilion dv3 Notebook PC", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), + DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv3 Notebook PC"), + }, + }, + { .callback = init_old_suspend_ordering, .ident = "Panasonic CF51-2L", .matches = { |