From: Bob Moore Date: Tue, 14 Feb 2012 07:22:51 +0000 (+0800) Subject: ACPICA: Move ACPI timer prototypes to public acpixf file X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d08310fe0d6bd8c82da94e8d8ef48bdbe14d2bd1;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git ACPICA: Move ACPI timer prototypes to public acpixf file These prototypes were incorrectly declared in achware.h. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown --- diff --git a/drivers/acpi/acpica/achware.h b/drivers/acpi/acpica/achware.h index 087f7106412d..eed204acf0f9 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 a28da35ba45e..67cd51c8ee0a 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h @@ -418,6 +418,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 */