1 files changed, 7 insertions, 9 deletions

diff --git a/drivers/acpi/acpica/utmisc.c b/drivers/acpi/acpica/utmisc.c
index 6c6a5137b728..32982e2ac384 100644
--- a/drivers/acpi/acpica/utmisc.c
+++ b/drivers/acpi/acpica/utmisc.c
@@ -5,7 +5,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
@@ -724,13 +724,12 @@ acpi_name acpi_ut_repair_name(char *name)
  *
  ******************************************************************************/
 
-acpi_status
-acpi_ut_strtoul64(char *string, u32 base, acpi_integer * ret_integer)
+acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 * ret_integer)
 {
         u32 this_digit = 0;
-        acpi_integer return_value = 0;
-        acpi_integer quotient;
-        acpi_integer dividend;
+        u64 return_value = 0;
+        u64 quotient;
+        u64 dividend;
         u32 to_integer_op = (base == ACPI_ANY_BASE);
         u32 mode32 = (acpi_gbl_integer_byte_width == 4);
         u8 valid_digits = 0;
@@ -844,9 +843,8 @@ acpi_ut_strtoul64(char *string, u32 base, acpi_integer * ret_integer)
 
                 /* Divide the digit into the correct position */
 
-                (void)
-                    acpi_ut_short_divide((dividend - (acpi_integer) this_digit),
-                                         base, &quotient, NULL);
+                (void)acpi_ut_short_divide((dividend - (u64) this_digit),
+                                           base, &quotient, NULL);
 
                 if (return_value > quotient) {
                         if (to_integer_op) {