diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-02-21 02:32:19 -0500 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-02-21 02:32:19 -0500 |
| commit | 3f60db4bde17088feed5f143582d7661cdbb9a01 (patch) | |
| tree | 21a7866ae6d199cfa8f619ced9500687bdf84f18 /drivers/acpi/sleep.c | |
| parent | 5e36097889725dbe4f098c3f1e93cb2f21cae6ee (diff) | |
| parent | b01543dfe67bb1d191998e90d20534dc354de059 (diff) | |
Merge commit 'v3.3-rc4'
Diffstat (limited to 'drivers/acpi/sleep.c')
| -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 0a7ed69546ba..ca191ff97844 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c | |||
| @@ -438,6 +438,14 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { | |||
| 438 | }, | 438 | }, |
| 439 | { | 439 | { |
| 440 | .callback = init_nvs_nosave, | 440 | .callback = init_nvs_nosave, |
| 441 | .ident = "Sony Vaio VPCCW29FX", | ||
| 442 | .matches = { | ||
| 443 | DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), | ||
| 444 | DMI_MATCH(DMI_PRODUCT_NAME, "VPCCW29FX"), | ||
| 445 | }, | ||
| 446 | }, | ||
| 447 | { | ||
| 448 | .callback = init_nvs_nosave, | ||
| 441 | .ident = "Averatec AV1020-ED2", | 449 | .ident = "Averatec AV1020-ED2", |
| 442 | .matches = { | 450 | .matches = { |
| 443 | DMI_MATCH(DMI_SYS_VENDOR, "AVERATEC"), | 451 | DMI_MATCH(DMI_SYS_VENDOR, "AVERATEC"), |