diff options
| author | Alex Elder <aelder@sgi.com> | 2010-08-02 10:24:57 -0500 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2010-08-02 10:24:57 -0500 |
| commit | 6b0a2996a0c023d84bc27ec7528a6e54cb5ea264 (patch) | |
| tree | 9fa9a85d5d871b3cb3c28daf57d8ef8f05becd66 /include/linux/acpi.h | |
| parent | 209fb87a259ead17e966627b7f053d16a96898da (diff) | |
| parent | 9fe6206f400646a2322096b56c59891d530e8d51 (diff) | |
Merge branch 'v2.6.35'
Diffstat (limited to 'include/linux/acpi.h')
| -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 { |