diff options
author | Len Brown <len.brown@intel.com> | 2009-04-05 01:52:07 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-04-05 01:52:07 -0400 |
commit | 8a3f257c704e02aee9869decd069a806b45be3f1 (patch) | |
tree | adb9d3766c57119381304c3b94334997cc7a74a7 /drivers/acpi/sleep.c | |
parent | 33526a53600ac887d100e3c9b4be3637ac8ae3a5 (diff) | |
parent | 15065531c1c5902775ae3ade24eb37d0e688353b (diff) |
Merge branch 'misc' into release
Diffstat (limited to 'drivers/acpi/sleep.c')
-rw-r--r-- | drivers/acpi/sleep.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 91a284b54dbf..779e4e500df4 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c | |||
@@ -396,6 +396,15 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { | |||
396 | DMI_MATCH(DMI_PRODUCT_NAME, "Satellite L300"), | 396 | DMI_MATCH(DMI_PRODUCT_NAME, "Satellite L300"), |
397 | }, | 397 | }, |
398 | }, | 398 | }, |
399 | { | ||
400 | .callback = init_old_suspend_ordering, | ||
401 | .ident = "Panasonic CF51-2L", | ||
402 | .matches = { | ||
403 | DMI_MATCH(DMI_BOARD_VENDOR, | ||
404 | "Matsushita Electric Industrial Co.,Ltd."), | ||
405 | DMI_MATCH(DMI_BOARD_NAME, "CF51-2L"), | ||
406 | }, | ||
407 | }, | ||
399 | {}, | 408 | {}, |
400 | }; | 409 | }; |
401 | #endif /* CONFIG_SUSPEND */ | 410 | #endif /* CONFIG_SUSPEND */ |