Changeset b5e68c8 in mainline for kernel/genarch/src/acpi/acpi.c

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/genarch/src/acpi/acpi.c (modified) (1 diff)

kernel/genarch/src/acpi/acpi.c

@@ -116 +116 @@
                     / sizeof(struct acpi_signature_map); j++) {
                         struct acpi_sdt_header *hdr =
-                            (struct acpi_sdt_header *) (unative_t) acpi_rsdt->entry[i];
+                            (struct acpi_sdt_header *) (sysarg_t) acpi_rsdt->entry[i];
                         
                         map_sdt(hdr);