diff options
| author | Len Brown <len.brown@intel.com> | 2010-05-28 16:17:27 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-05-28 16:17:27 -0400 |
| commit | 91dd6964390b331beb731623cb59c4a933ff8162 (patch) | |
| tree | 2d22bdbd92e1e642fa4a77be4d4bf4cc5cbba2a9 /include/linux | |
| parent | dc1544ea5d6dfdf29440295788e639e4b44c605a (diff) | |
| parent | b6dacf63e9fb2e7a1369843d6cef332f76fca6a3 (diff) | |
Merge branch 'acpi_enable' into release
Diffstat (limited to 'include/linux')
| -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, | |||
| 251 | void __init acpi_no_s4_hw_signature(void); | 251 | void __init acpi_no_s4_hw_signature(void); |
| 252 | void __init acpi_old_suspend_ordering(void); | 252 | void __init acpi_old_suspend_ordering(void); |
| 253 | void __init acpi_s4_no_nvs(void); | 253 | void __init acpi_s4_no_nvs(void); |
| 254 | void __init acpi_set_sci_en_on_resume(void); | ||
| 255 | #endif /* CONFIG_PM_SLEEP */ | 254 | #endif /* CONFIG_PM_SLEEP */ |
| 256 | 255 | ||
| 257 | struct acpi_osc_context { | 256 | struct acpi_osc_context { |