Changeset db71e2a in mainline for boot/arch/amd64/Makefile.inc


Ignore:
Timestamp:
2013-07-24T17:42:25Z (12 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
69b264a9
Parents:
52f1882 (diff), cffa14e6 (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.

usb hc macro changes from mainline were reverted, too many conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed

  • boot/arch/amd64/Makefile.inc

    r52f1882 rdb71e2a  
    3131        $(USPACE_PATH)/srv/hw/irc/i8259/i8259
    3232
    33 RD_SRVS_NON_ESSENTIAL += \
    34         $(USPACE_PATH)/srv/bd/ata_bd/ata_bd
    35 
    3633RD_DRVS += \
    3734        infrastructure/rootpc \
     35        block/ata_bd \
    3836        bus/pci/pciintel \
    3937        bus/isa \
Note: See TracChangeset for help on using the changeset viewer.