Ignore:
Timestamp:
2012-02-16T22:16:18Z (12 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
4d433fe
Parents:
9744f2d (diff), c01bb5f9 (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:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/sparc64/src/drivers/kbd.c

    r9744f2d r39aa8ce  
    133133        sysinfo_set_item_val("kbd", NULL, true);
    134134        sysinfo_set_item_val("kbd.inr", NULL, inr);
    135         sysinfo_set_item_val("kbd.address.kernel", NULL,
    136             (uintptr_t) ns16550);
    137135        sysinfo_set_item_val("kbd.address.physical", NULL, pa);
    138136        sysinfo_set_item_val("kbd.type.ns16550", NULL, true);
Note: See TracChangeset for help on using the changeset viewer.