Merge branch 'for-next' into for-linus

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

diff --git a/drivers/acpi/acpica/psargs.c b/drivers/acpi/acpica/psargs.c
index b161f3544b51eaa82ab98350350b155f0669cf68..00493e108a0178231748918d4784fa6338f3141d 100644 (file)
--- a/drivers/acpi/acpica/psargs.c
+++ b/drivers/acpi/acpica/psargs.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
@@ -403,7 +403,7 @@ acpi_ps_get_next_simple_arg(struct acpi_parse_state *parser_state,
                /* Get 1 byte from the AML stream */
 
                opcode = AML_BYTE_OP;
-               arg->common.value.integer = (acpi_integer) * aml;
+               arg->common.value.integer = (u64) *aml;
                length = 1;
                break;