Skip to content

L
linux-davinci
Commit 43758dd8 authored by Len Brown's avatar Len Brown
Browse files
Options

Merge branch 'bugzilla-13449' into release

parents 12308a2f 2839d396
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 0 deletions
drivers/acpi/sleep.c
View file @ 43758dd8
...@@ -413,6 +413,30 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { ...@@ -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, .callback = init_old_suspend_ordering,
.ident = "Panasonic CF51-2L", .ident = "Panasonic CF51-2L",
.matches = { .matches = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment