Changeset 371bd7d in mainline for kernel/genarch/include/acpi/acpi.h

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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) (2 diffs)

kernel/genarch/include/acpi/acpi.h

@@ -36 +36 @@
 #define KERN_ACPI_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 /* Root System Description Pointer */
@@ -67 +67 @@
         uint8_t *signature;
         struct acpi_sdt_header **sdt_ptr;
-        char *description;
+        const char *description;
 };