Changeset 46c20c8 in mainline for kernel/arch/sparc64/src/drivers/sgcn.c

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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/arch/sparc64/src/drivers/sgcn.c (modified) (2 diffs)

kernel/arch/sparc64/src/drivers/sgcn.c

@@ -40 +40 @@
 #include <genarch/ofw/ofw_tree.h>
 #include <debug.h>
-#include <string.h>
+#include <str.h>
 #include <print.h>
 #include <mm/page.h>
@@ -132 +132 @@
 static void init_sram_begin(void)
 {
-        ASSERT(instance)
+        ASSERT(instance);
         
         ofw_tree_node_t *chosen = ofw_tree_lookup("/chosen");