diff options
| author | Len Brown <len.brown@intel.com> | 2010-12-14 04:40:54 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-12-14 04:40:54 +0100 |
| commit | 23437b5c50f523a87ca5c02fd883b069ca8be7f3 (patch) | |
| tree | fa282bc6e3d8c6cc84268442e4d9b1b8a90830f4 /drivers/acpi | |
| parent | Merge branches 'bugzilla-15418', 'bugzilla-21722', 'bugzilla-22932', 'misc-2.... (diff) | |
| parent | ACPI / PM: Do not save/restore NVS on Sony Vaio VGN-NW130D (diff) | |
| download | linux-23437b5c50f523a87ca5c02fd883b069ca8be7f3.tar.xz linux-23437b5c50f523a87ca5c02fd883b069ca8be7f3.zip | |
Merge branch 'bugzilla-23002' into release
Diffstat (limited to 'drivers/acpi')
| -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[] = { DMI_MATCH(DMI_PRODUCT_NAME, "VPCEB1Z1E"), }, }, + { + .callback = init_nvs_nosave, + .ident = "Sony Vaio VGN-NW130D", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), + DMI_MATCH(DMI_PRODUCT_NAME, "VGN-NW130D"), + }, + }, {}, }; #endif /* CONFIG_SUSPEND */ |