diff options
| author | Len Brown <len.brown@intel.com> | 2010-12-13 22:40:54 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-12-13 22:40:54 -0500 |
| commit | 23437b5c50f523a87ca5c02fd883b069ca8be7f3 (patch) | |
| tree | fa282bc6e3d8c6cc84268442e4d9b1b8a90830f4 /drivers/acpi/sleep.c | |
| parent | 6cc5615f7c4decd7b6c4da9317d0e0b5fbdf7290 (diff) | |
| parent | 291a73c9be15f12046a7291ec0bf7176a58d4f14 (diff) | |
Merge branch 'bugzilla-23002' into release
Diffstat (limited to 'drivers/acpi/sleep.c')
| -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 2182c5579230..febb153b5a68 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c | |||
| @@ -427,6 +427,14 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { | |||
| 427 | DMI_MATCH(DMI_PRODUCT_NAME, "VPCEB1Z1E"), | 427 | DMI_MATCH(DMI_PRODUCT_NAME, "VPCEB1Z1E"), |
| 428 | }, | 428 | }, |
| 429 | }, | 429 | }, |
| 430 | { | ||
| 431 | .callback = init_nvs_nosave, | ||
| 432 | .ident = "Sony Vaio VGN-NW130D", | ||
| 433 | .matches = { | ||
| 434 | DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), | ||
| 435 | DMI_MATCH(DMI_PRODUCT_NAME, "VGN-NW130D"), | ||
| 436 | }, | ||
| 437 | }, | ||
| 430 | {}, | 438 | {}, |
| 431 | }; | 439 | }; |
| 432 | #endif /* CONFIG_SUSPEND */ | 440 | #endif /* CONFIG_SUSPEND */ |