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

Ignore:
Timestamp:
2010-12-17T08:59:35Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
58854f2
Parents:
70e5ad5 (diff), 11658b64 (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 development/ changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/arm32/src/mach/testarm/testarm.c

    r70e5ad5 r5863a95  
    123123        sysinfo_set_item_val("kbd", NULL, true);
    124124        sysinfo_set_item_val("kbd.inr", NULL, GXEMUL_KBD_IRQ);
    125         sysinfo_set_item_val("kbd.address.virtual", NULL, (unative_t) gxemul_kbd);
     125        sysinfo_set_item_val("kbd.address.virtual", NULL, (sysarg_t) gxemul_kbd);
    126126#endif
    127127}
Note: See TracChangeset for help on using the changeset viewer.