diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-30 06:15:18 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-30 06:15:18 +0400 |
| commit | 91a5698d1f253d30f53f0c58d2504eaec481b854 (patch) | |
| tree | 684d8060e16b33c6ede5b814dbd459e0c5cb1f39 /drivers | |
| parent | 084bad91afd0f40ff4db9ceb56e29234c314d8d1 (diff) | |
| parent | dddac6a7b445de95515f64fdf82fe5dc36c02f26 (diff) | |
| download | linux-91a5698d1f253d30f53f0c58d2504eaec481b854.tar.xz | |
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PM / Hibernate: Replace bdget call with simple atomic_inc of i_count
PM / ACPI: HP G7000 Notebook needs a SCI_EN resume quirk
Diffstat (limited to 'drivers')
| -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 01574a066534..42159a28f433 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -397,6 +397,14 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { }, }, { + .callback = init_set_sci_en_on_resume, + .ident = "Hewlett-Packard HP G7000 Notebook PC", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), + DMI_MATCH(DMI_PRODUCT_NAME, "HP G7000 Notebook PC"), + }, + }, + { .callback = init_old_suspend_ordering, .ident = "Panasonic CF51-2L", .matches = { |