summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-12-14 06:40:54 +0300
committerLen Brown <len.brown@intel.com>2010-12-14 06:40:54 +0300
commit23437b5c50f523a87ca5c02fd883b069ca8be7f3 (patch)
treefa282bc6e3d8c6cc84268442e4d9b1b8a90830f4 /drivers
parent6cc5615f7c4decd7b6c4da9317d0e0b5fbdf7290 (diff)
parent291a73c9be15f12046a7291ec0bf7176a58d4f14 (diff)
downloadlinux-23437b5c50f523a87ca5c02fd883b069ca8be7f3.tar.xz
Merge branch 'bugzilla-23002' into release
Diffstat (limited to 'drivers')
-rw-r--r--drivers/acpi/sleep.c8
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 */