Fork us on GitHub Follow us on Facebook Follow us on Twitter

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


Ignore:
Timestamp:
2010-12-05T09:34:46Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
75732da
Parents:
56b962d (diff), 35537a7 (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 with development/

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/sparc64/src/console.c

    r56b962d r84439d7  
    7070        ofw_tree_node_t *screen = ofw_tree_lookup(prop_scr->value);
    7171        if (!screen)
    72                 panic("Cannot find %s.", prop_scr->value);
     72                panic("Cannot find %s.", (char *) prop_scr->value);
    7373       
    7474        scr_init(screen);
     
    8383        ofw_tree_node_t *keyboard = ofw_tree_lookup(prop_kbd->value);
    8484        if (!keyboard)
    85                 panic("Cannot find %s.", prop_kbd->value);
     85                panic("Cannot find %s.", (char *) prop_kbd->value);
    8686       
    8787        kbd_init(keyboard);
Note: See TracChangeset for help on using the changeset viewer.