Merge branch 'bugzilla-23002' into release

23437b5c · Len Brown · 6cc5615f · 291a73c9 · 23437b5c
Commit 23437b5c authored Dec 13, 2010 by Len Brown
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

drivers/acpi/sleep.c drivers/acpi/sleep.c +8 -0

No files found.
--- 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 */