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 6b282e85d039553a60e507d8241b36ea78cecd2e..1ef8e0bb250bd0dccbedd533e4229fedcb739086 100644 (file)
--- a/drivers/acpi/acpica/hwtimer.c
+++ b/drivers/acpi/acpica/hwtimer.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -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);