Changeset 7715994 in mainline for kernel/genarch/include/acpi/acpi.h

Timestamp:

2010-03-13T12:17:02Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6ba20a6b

Parents:

d0febca (diff), 2070570 (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/include/acpi/acpi.h (modified) (1 diff)

kernel/genarch/include/acpi/acpi.h

@@ -67 +67 @@
         uint8_t *signature;
         struct acpi_sdt_header **sdt_ptr;
-        char *description;
+        const char *description;
 };