Changeset 4006447 in mainline for boot


Ignore:
Timestamp:
2010-12-06T20:03:54Z (15 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c0bd08d
Parents:
b38dfd8 (diff), 463e734 (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 from lp:~vojtech-horky/helenos/ddf-fixes.

Location:
boot
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.common

    rb38dfd8 r4006447  
    109109       
    110110RD_DRVS = \
    111         root
     111        root \
     112        rootvirt \
     113        test1 \
     114        test2
    112115
    113116RD_DRV_CFG =

  • boot/arch/amd64/Makefile.inc

    rb38dfd8 r4006447  
    3737
    3838RD_DRVS += \
    39         rootia32 \
     39        rootpc \
    4040        pciintel \
    4141        isa \
Note: See TracChangeset for help on using the changeset viewer.