diff options
| author | Len Brown <len.brown@intel.com> | 2010-05-28 22:17:27 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-05-28 22:17:27 +0200 |
| commit | 91dd6964390b331beb731623cb59c4a933ff8162 (patch) | |
| tree | 2d22bdbd92e1e642fa4a77be4d4bf4cc5cbba2a9 /include | |
| parent | Merge branch 'bjorn-pci-root-v4-2.6.35' into release (diff) | |
| parent | ACPI: Unconditionally set SCI_EN on resume (diff) | |
| download | linux-91dd6964390b331beb731623cb59c4a933ff8162.tar.xz linux-91dd6964390b331beb731623cb59c4a933ff8162.zip | |
Merge branch 'acpi_enable' into release
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/acpi.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index b926afe8c03e..87ca4913294c 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -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 { |