Changeset 1787e527 in mainline for boot/arch/arm32/loader/main.c

Timestamp:

2009-11-16T21:22:54Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

5ebdf94

Parents:

fcbd1be (diff), 9c70ed6 (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:

merged with head (unstable)

File:

• boot/arch/arm32/loader/main.c (modified) (1 diff)

boot/arch/arm32/loader/main.c

@@ -43 +43 @@
 #include <macros.h>
 #include <string.h>
+#include <memstr.h>
 
 #include "mm.h"