Merge branch 'for-next' into for-linus

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

diff --git a/drivers/acpi/acpica/evrgnini.c b/drivers/acpi/acpica/evrgnini.c
index 86bd5a7f40d04169cb937f976b28c9037845e1fb..2e3b0334072f2f67943883097b0a5b8b20e1943a 100644 (file)
--- a/drivers/acpi/acpica/evrgnini.c
+++ b/drivers/acpi/acpica/evrgnini.c
@@ -168,7 +168,7 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,
                                void *handler_context, void **region_context)
 {
        acpi_status status = AE_OK;
-       acpi_integer pci_value;
+       u64 pci_value;
        struct acpi_pci_id *pci_id = *region_context;
        union acpi_operand_object *handler_obj;
        struct acpi_namespace_node *parent_node;