Changeset 6843a9c in mainline for boot/arch/amd64/Makefile.inc


Ignore:
Timestamp:
2012-06-29T13:02:14Z (12 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
722912e
Parents:
ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • boot/arch/amd64/Makefile.inc

    rba72f2b r6843a9c  
    2727#
    2828
    29 PAGE_SIZE = 4096
    30 
    3129RD_SRVS_ESSENTIAL += \
    32         $(USPACE_PATH)/srv/hw/char/i8042/i8042 \
    3330        $(USPACE_PATH)/srv/hw/irc/apic/apic \
    3431        $(USPACE_PATH)/srv/hw/irc/i8259/i8259
    … …  
    4340        bus/pci/pciintel \
    4441        bus/isa \
     42        char/i8042 \
     43        char/ns8250 \
     44        char/ps2mouse \
     45        char/xtkbd \
    4546        bus/usb/ehci\
    4647        bus/usb/ohci \
Note: See TracChangeset for help on using the changeset viewer.