| commit | 23437b5c50f523a87ca5c02fd883b069ca8be7f3 | [log] [tgz] |
|---|---|---|
| author | Len Brown <len.brown@intel.com> | Mon Dec 13 22:40:54 2010 -0500 |
| committer | Len Brown <len.brown@intel.com> | Mon Dec 13 22:40:54 2010 -0500 |
| tree | fa282bc6e3d8c6cc84268442e4d9b1b8a90830f4 | |
| parent | 6cc5615f7c4decd7b6c4da9317d0e0b5fbdf7290 [diff] | |
| parent | 291a73c9be15f12046a7291ec0bf7176a58d4f14 [diff] |
Merge branch 'bugzilla-23002' into release
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 2182c55..febb153 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c
@@ -427,6 +427,14 @@ 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 */