diff options
| author | Bob Moore <robert.moore@intel.com> | 2012-02-14 15:22:51 +0800 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-03-22 01:44:38 -0400 |
| commit | d08310fe0d6bd8c82da94e8d8ef48bdbe14d2bd1 (patch) | |
| tree | 71ad591d88cf75e8f5043a1f39927e665d65eeac | |
| parent | 2feec47d4c5f80b05f1650f5a24865718978eea4 (diff) | |
ACPICA: Move ACPI timer prototypes to public acpixf file
These prototypes were incorrectly declared in achware.h.
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
| -rw-r--r-- | drivers/acpi/acpica/achware.h | 12 | ||||
| -rw-r--r-- | include/acpi/acpixf.h | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/drivers/acpi/acpica/achware.h b/drivers/acpi/acpica/achware.h index 087f7106412..eed204acf0f 100644 --- a/drivers/acpi/acpica/achware.h +++ b/drivers/acpi/acpica/achware.h @@ -145,16 +145,4 @@ acpi_status acpi_hw_derive_pci_id(struct acpi_pci_id *pci_id, acpi_handle root_pci_device, acpi_handle pci_region); -#ifdef ACPI_FUTURE_USAGE -/* - * hwtimer - ACPI Timer prototypes - */ -acpi_status acpi_get_timer_resolution(u32 * resolution); - -acpi_status acpi_get_timer(u32 * ticks); - -acpi_status -acpi_get_timer_duration(u32 start_ticks, u32 end_ticks, u32 * time_elapsed); -#endif /* ACPI_FUTURE_USAGE */ - #endif /* __ACHWARE_H__ */ diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index a28da35ba45..67cd51c8ee0 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h @@ -419,6 +419,18 @@ acpi_status acpi_leave_sleep_state_prep(u8 sleep_state); acpi_status acpi_leave_sleep_state(u8 sleep_state); /* + * ACPI Timer interfaces + */ +#ifdef ACPI_FUTURE_USAGE +acpi_status acpi_get_timer_resolution(u32 *resolution); + +acpi_status acpi_get_timer(u32 *ticks); + +acpi_status +acpi_get_timer_duration(u32 start_ticks, u32 end_ticks, u32 *time_elapsed); +#endif /* ACPI_FUTURE_USAGE */ + +/* * Error/Warning output */ void ACPI_INTERNAL_VAR_XFACE |