Merge branch 'bugzilla-23002' into release

git-mirror · Dec 14, 2010 · 23437b5 · 23437b5
2 parents 6cc5615 + 291a73c
commit 23437b5
Showing 1 changed file with 8 additions and 0 deletions.
diff --git 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 */