Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Bob Moore and committed by
Len Brown
d08310fe 2feec47d

+12 -12
-12
drivers/acpi/acpica/achware.h
··· 145 145 acpi_hw_derive_pci_id(struct acpi_pci_id *pci_id, 146 146 acpi_handle root_pci_device, acpi_handle pci_region); 147 147 148 - #ifdef ACPI_FUTURE_USAGE 149 - /* 150 - * hwtimer - ACPI Timer prototypes 151 - */ 152 - acpi_status acpi_get_timer_resolution(u32 * resolution); 153 - 154 - acpi_status acpi_get_timer(u32 * ticks); 155 - 156 - acpi_status 157 - acpi_get_timer_duration(u32 start_ticks, u32 end_ticks, u32 * time_elapsed); 158 - #endif /* ACPI_FUTURE_USAGE */ 159 - 160 148 #endif /* __ACHWARE_H__ */
+12
include/acpi/acpixf.h
··· 419 419 acpi_status acpi_leave_sleep_state(u8 sleep_state); 420 420 421 421 /* 422 + * ACPI Timer interfaces 423 + */ 424 + #ifdef ACPI_FUTURE_USAGE 425 + acpi_status acpi_get_timer_resolution(u32 *resolution); 426 + 427 + acpi_status acpi_get_timer(u32 *ticks); 428 + 429 + acpi_status 430 + acpi_get_timer_duration(u32 start_ticks, u32 end_ticks, u32 *time_elapsed); 431 + #endif /* ACPI_FUTURE_USAGE */ 432 + 433 + /* 422 434 * Error/Warning output 423 435 */ 424 436 void ACPI_INTERNAL_VAR_XFACE