diff options
| author | Len Brown <len.brown@intel.com> | 2010-07-24 23:26:22 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-07-24 23:26:22 -0400 |
| commit | 0e1cf38889110a7188999388614aef17a84d9d25 (patch) | |
| tree | 828ba587fc124a2c28cb52d2b6a8ea07e4b57079 /include | |
| parent | bbac30edb39a80426e4a3420a5ec635eb4466f63 (diff) | |
| parent | 72ad5d77fb981963edae15eee8196c80238f5ed0 (diff) | |
Merge branch 'bugzilla-16396' into release
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/acpi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 224a38c960d4..ccf94dc5acdf 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -253,7 +253,7 @@ int acpi_resources_are_enforced(void); #ifdef CONFIG_PM_SLEEP void __init acpi_no_s4_hw_signature(void); void __init acpi_old_suspend_ordering(void); -void __init acpi_s4_no_nvs(void); +void __init acpi_nvs_nosave(void); #endif /* CONFIG_PM_SLEEP */ struct acpi_osc_context { |