Changeset eb522e8 in mainline for kernel/arch/sparc64/src/console.c

Timestamp:

2011-06-01T08:43:42Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8d6c1f1

Parents:

9e2e715 (diff), e51a514 (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:

Huuuuuge merge from development - all the work actually

File:

• kernel/arch/sparc64/src/console.c (modified) (2 diffs)

kernel/arch/sparc64/src/console.c

@@ -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);