Changeset 87b52c9 in mainline for kernel/genarch/src/ofw/ofw_tree.c

Timestamp:

2011-04-01T11:34:41Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

66a54cc

Parents:

df3ad97 (diff), 27bdfa5 (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 from usb/development

File:

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

kernel/genarch/src/ofw/ofw_tree.c

@@ -37 +37 @@
 
 #include <genarch/ofw/ofw_tree.h>
-#include <arch/memstr.h>
 #include <mm/slab.h>
+#include <memstr.h>
 #include <str.h>
 #include <panic.h>