lkml.org 
[lkml]   [2012]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 25/76] ACPICA: Move ACPI timer prototypes to public acpixf file
    Date
    From: Bob Moore <robert.moore@intel.com>

    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>
    ---
    drivers/acpi/acpica/achware.h | 12 ------------
    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 087f710..eed204a 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 a28da35..67cd51c 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
    --
    1.7.10.rc2.19.gfae9d


    \
     
     \ /
      Last update: 2012-03-30 14:25    [W:4.341 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site