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

Changeset 070e05a in mainline


Ignore:
Timestamp:
2010-01-11T20:31:38Z (12 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master
Children:
439ba77
Parents:
c03f610 (diff), 03a4476 (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 real fix for ticket #159.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/ia64/src/ia64.c

    rc03f610 r070e05a  
    203203        }
    204204       
    205         sysinfo_set_item_val("kbd", NULL, true);
    206         sysinfo_set_item_val("kbd.inr", NULL, IRQ_KBD);
    207         sysinfo_set_item_val("kbd.type", NULL, KBD_LEGACY);
    208         sysinfo_set_item_val("kbd.address.physical", NULL,
     205        sysinfo_set_item_val("i8042", NULL, true);
     206        sysinfo_set_item_val("i8042.inr_a", NULL, IRQ_KBD);
     207        sysinfo_set_item_val("i8042.inr_b", NULL, IRQ_MOUSE);
     208        sysinfo_set_item_val("i8042.address.physical", NULL,
    209209            (uintptr_t) I8042_BASE);
    210         sysinfo_set_item_val("kbd.address.kernel", NULL,
     210        sysinfo_set_item_val("i8042.address.kernel", NULL,
    211211            (uintptr_t) I8042_BASE);
    212212#endif
Note: See TracChangeset for help on using the changeset viewer.