Merge branch 'for-next' into for-linus

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

diff --git a/drivers/acpi/acpica/uteval.c b/drivers/acpi/acpica/uteval.c
index 5d54e36ab4536eb151acf54cf4a11c89dd9796de..7f5e734ce7f7a1e1b05025765bb33ab29093f4ec 100644 (file)
--- a/drivers/acpi/acpica/uteval.c
+++ b/drivers/acpi/acpica/uteval.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
@@ -348,7 +348,7 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,
 acpi_status
 acpi_ut_evaluate_numeric_object(char *object_name,
                                struct acpi_namespace_node *device_node,
-                               acpi_integer *value)
+                               u64 *value)
 {
        union acpi_operand_object *obj_desc;
        acpi_status status;