Changeset a1347a7 in mainline for boot


Ignore:
Timestamp:
2012-01-15T13:51:09Z (14 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
bd79281
Parents:
03e0a244 (diff), f302586 (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

Location:
boot/arch
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • boot/arch/amd64/Makefile.inc

    r03e0a244 ra1347a7  
    2828
    2929RD_SRVS_ESSENTIAL += \
    30         $(USPACE_PATH)/srv/hw/char/i8042/i8042 \
    3130        $(USPACE_PATH)/srv/hw/irc/apic/apic \
    3231        $(USPACE_PATH)/srv/hw/irc/i8259/i8259
    … …  
    3938        bus/pci/pciintel \
    4039        bus/isa \
     40        char/i8042 \
    4141        char/ns8250 \
     42        char/ps2mouse \
     43        char/xtkbd \
    4244        bus/usb/ehci\
    4345        bus/usb/ohci \

  • boot/arch/ia64/Makefile.inc

    r03e0a244 ra1347a7  
    3737RD_SRVS_NON_ESSENTIAL +=
    3838
    39 RD_SRVS_ESSENTIAL += \
    40         $(USPACE_PATH)/srv/hw/char/i8042/i8042
     39RD_SRVS_ESSENTIAL +=
    4140
    4241SOURCES = \
Note: See TracChangeset for help on using the changeset viewer.