diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-09 03:38:15 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:38:15 -0500 |
| commit | 3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77 (patch) | |
| tree | 82b60e24ce5457e2e21e00bfa3b2f171d7eb97ce /include/linux/acpi.h | |
| parent | d0302bc62af7983040ea1cd1b5dd2b36e1a6a509 (diff) | |
| parent | ada9cfdd158abb8169873dc8e5ae39b1ec6ffa8c (diff) | |
Merge branch 'suspend' into release
Diffstat (limited to 'include/linux/acpi.h')
| -rw-r--r-- | include/linux/acpi.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index fba8051fb29..dfa0a5356c5 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -270,6 +270,7 @@ int acpi_check_mem_region(resource_size_t start, resource_size_t n, #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); #endif /* CONFIG_PM_SLEEP */ #else /* CONFIG_ACPI */ |