Merge branch 'acpi_enable' into release

This commit is contained in:
Len Brown 2010-05-28 16:17:27 -04:00
commit 91dd696439
5 changed files with 24 additions and 189 deletions

View file

@ -251,7 +251,6 @@ int acpi_check_mem_region(resource_size_t start, resource_size_t n,
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_set_sci_en_on_resume(void);
#endif /* CONFIG_PM_SLEEP */
struct acpi_osc_context {