diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-12-22 19:21:47 -0500 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-12-22 19:21:47 -0500 |
| commit | f80ca163d65903276bec7045a484a79c0897eb2d (patch) | |
| tree | 97c7d61d43248b9db0757a76af80ff58b98b5599 /drivers/acpi/sleep.c | |
| parent | 0794ec8ce327ec74416b569b8fb1951274693700 (diff) | |
| parent | a6d52d70677e99bdb89b6921c265d0a58c22e597 (diff) | |
Merge branch 'ioat' into fixes
Diffstat (limited to 'drivers/acpi/sleep.c')
| -rw-r--r-- | drivers/acpi/sleep.c | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index a90afcc723ab..5f2c379ab7bf 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c | |||
| @@ -413,6 +413,38 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { | |||
| 413 | }, | 413 | }, |
| 414 | }, | 414 | }, |
| 415 | { | 415 | { |
| 416 | .callback = init_set_sci_en_on_resume, | ||
| 417 | .ident = "Hewlett-Packard Pavilion dv4", | ||
| 418 | .matches = { | ||
| 419 | DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), | ||
| 420 | DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv4"), | ||
| 421 | }, | ||
| 422 | }, | ||
| 423 | { | ||
| 424 | .callback = init_set_sci_en_on_resume, | ||
| 425 | .ident = "Hewlett-Packard Pavilion dv7", | ||
| 426 | .matches = { | ||
| 427 | DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), | ||
| 428 | DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv7"), | ||
| 429 | }, | ||
| 430 | }, | ||
| 431 | { | ||
| 432 | .callback = init_set_sci_en_on_resume, | ||
| 433 | .ident = "Hewlett-Packard Compaq Presario C700 Notebook PC", | ||
| 434 | .matches = { | ||
| 435 | DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), | ||
| 436 | DMI_MATCH(DMI_PRODUCT_NAME, "Compaq Presario C700 Notebook PC"), | ||
| 437 | }, | ||
| 438 | }, | ||
| 439 | { | ||
| 440 | .callback = init_set_sci_en_on_resume, | ||
| 441 | .ident = "Hewlett-Packard Compaq Presario CQ40 Notebook PC", | ||
| 442 | .matches = { | ||
| 443 | DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), | ||
| 444 | DMI_MATCH(DMI_PRODUCT_NAME, "Compaq Presario CQ40 Notebook PC"), | ||
| 445 | }, | ||
| 446 | }, | ||
| 447 | { | ||
| 416 | .callback = init_old_suspend_ordering, | 448 | .callback = init_old_suspend_ordering, |
| 417 | .ident = "Panasonic CF51-2L", | 449 | .ident = "Panasonic CF51-2L", |
| 418 | .matches = { | 450 | .matches = { |
