diff options
| author | Len Brown <len.brown@intel.com> | 2009-11-06 09:45:11 +0300 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-11-06 09:45:11 +0300 |
| commit | 43758dd88fdf1e5b3897c7a04dfae0afb8313dea (patch) | |
| tree | 27958490380394afe164801bdbe09a7c71097eeb /drivers/acpi | |
| parent | 12308a2f2703d135681b3e9cf582009747f588f7 (diff) | |
| parent | 2839d396e3ae0891c1fdd87aa1cea218e6f5c4df (diff) | |
| download | linux-43758dd88fdf1e5b3897c7a04dfae0afb8313dea.tar.xz | |
Merge branch 'bugzilla-13449' into release
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/sleep.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index a90afcc723ab..4cc1b8116e76 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -413,6 +413,30 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { }, }, { + .callback = init_set_sci_en_on_resume, + .ident = "Hewlett-Packard Pavilion dv4", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), + DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv4"), + }, + }, + { + .callback = init_set_sci_en_on_resume, + .ident = "Hewlett-Packard Pavilion dv7", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), + DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv7"), + }, + }, + { + .callback = init_set_sci_en_on_resume, + .ident = "Hewlett-Packard Compaq Presario CQ40 Notebook PC", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), + DMI_MATCH(DMI_PRODUCT_NAME, "Compaq Presario CQ40 Notebook PC"), + }, + }, + { .callback = init_old_suspend_ordering, .ident = "Panasonic CF51-2L", .matches = { |