Changeset 46c20c8 in mainline for kernel/arch/sparc64/src/console.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/console.c (modified) (4 diffs)

kernel/arch/sparc64/src/console.c

@@ -34 +34 @@
 
 #include <arch/console.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 #include <arch/drivers/scr.h>
@@ -49 +49 @@
 #include <arch.h>
 #include <panic.h>
-#include <string.h>
+#include <str.h>
 #include <print.h>
 
@@ -70 +70 @@
         ofw_tree_node_t *screen = ofw_tree_lookup(prop_scr->value);
         if (!screen)
-                panic("Cannot find %s.", prop_scr->value);
+                panic("Cannot find %s.", (char *) prop_scr->value);
         
         scr_init(screen);
@@ -83 +83 @@
         ofw_tree_node_t *keyboard = ofw_tree_lookup(prop_kbd->value);
         if (!keyboard)
-                panic("Cannot find %s.", prop_kbd->value);
+                panic("Cannot find %s.", (char *) prop_kbd->value);
         
         kbd_init(keyboard);