Merge branch 'bugzilla-16396' into release

This commit is contained in:
Len Brown 2010-07-24 23:26:22 -04:00
commit 0e1cf38889
5 changed files with 34 additions and 23 deletions

View file

@ -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 {