Merge commit 'v2.6.34-rc6'

[pandora-kernel.git] / include / acpi / acrestyp.h

diff --git a/include/acpi/acrestyp.h b/include/acpi/acrestyp.h
index 9ffe00f..e552635 100644 (file)
--- a/include/acpi/acrestyp.h
+++ b/include/acpi/acrestyp.h
@@ -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
@@ -397,7 +397,7 @@ struct acpi_resource {
 struct acpi_pci_routing_table {
        u32 length;
        u32 pin;
-       acpi_integer address;   /* here for 64-bit alignment */
+       u64 address;            /* here for 64-bit alignment */
        u32 source_index;
        char source[4];         /* pad to 64 bits so sizeof() works in all cases */
 };