Merge branch 'for-next' into for-linus

[karo-tx-linux.git] / drivers / acpi / acpica / hwtimer.c

diff --git a/drivers/acpi/acpica/hwtimer.c b/drivers/acpi/acpica/hwtimer.c
index ce0cbbc18ad076a2325807915aefc4f799773207..1ef8e0bb250bd0dccbedd533e4229fedcb739086 100644 (file)
--- a/drivers/acpi/acpica/hwtimer.c
+++ b/drivers/acpi/acpica/hwtimer.c
@@ -140,7 +140,7 @@ acpi_get_timer_duration(u32 start_ticks, u32 end_ticks, u32 * time_elapsed)
 {
        acpi_status status;
        u32 delta_ticks;
-       acpi_integer quotient;
+       u64 quotient;
 
        ACPI_FUNCTION_TRACE(acpi_get_timer_duration);