summaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2012-02-14 08:22:51 +0100
committerLen Brown <len.brown@intel.com>2012-03-22 06:44:38 +0100
commitd08310fe0d6bd8c82da94e8d8ef48bdbe14d2bd1 (patch)
tree71ad591d88cf75e8f5043a1f39927e665d65eeac /include/acpi
parentACPICA: ACPI 5: Support for new FADT SleepStatus, SleepControl registers (diff)
downloadlinux-d08310fe0d6bd8c82da94e8d8ef48bdbe14d2bd1.tar.xz
linux-d08310fe0d6bd8c82da94e8d8ef48bdbe14d2bd1.zip
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>
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acpixf.h12
1 files changed, 12 insertions, 0 deletions
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
@@ -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