diff options
| author | Len Brown <len.brown@intel.com> | 2011-01-12 04:55:46 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-12 04:55:46 -0500 |
| commit | fb4af417cce9ff87abf33a6bb9a0cf613e285364 (patch) | |
| tree | 328ce710c6e6acf7b58145da939fb3cc91d188c9 /drivers/acpi/sleep.c | |
| parent | 07bf280521bb06bc8e64f0b998fc391253fcb959 (diff) | |
| parent | 7b330707dddab1ad772898c1c82516342a551173 (diff) | |
Merge branch 'wakeup-etc-rafael' into release
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 febb153b5a68..ddc5cce508a1 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c | |||
| @@ -435,6 +435,14 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { | |||
| 435 | DMI_MATCH(DMI_PRODUCT_NAME, "VGN-NW130D"), | 435 | DMI_MATCH(DMI_PRODUCT_NAME, "VGN-NW130D"), |
| 436 | }, | 436 | }, |
| 437 | }, | 437 | }, |
| 438 | { | ||
| 439 | .callback = init_nvs_nosave, | ||
| 440 | .ident = "Averatec AV1020-ED2", | ||
| 441 | .matches = { | ||
| 442 | DMI_MATCH(DMI_SYS_VENDOR, "AVERATEC"), | ||
| 443 | DMI_MATCH(DMI_PRODUCT_NAME, "1000 Series"), | ||
| 444 | }, | ||
| 445 | }, | ||
| 438 | {}, | 446 | {}, |
| 439 | }; | 447 | }; |
| 440 | #endif /* CONFIG_SUSPEND */ | 448 | #endif /* CONFIG_SUSPEND */ |