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

Changeset ae49252 in mainline for boot/Makefile.common


Ignore:
Timestamp:
2012-07-18T21:45:07Z (10 years ago)
Author:
Sean Bartell <wingedtachikoma@…>
Branches:
lfn, master
Children:
5f4cf872
Parents:
349e510d (diff), 7030bc9 (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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • boot/Makefile.common

    r349e510d rae49252  
    9898        $(USPACE_PATH)/srv/bd/part/guid_part/g_part \
    9999        $(USPACE_PATH)/srv/bd/part/mbr_part/mbr_part \
     100        $(USPACE_PATH)/srv/bd/sata_bd/sata_bd \
    100101        $(USPACE_PATH)/srv/clipboard/clipboard \
    101102        $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \
     
    122123        nic/ne2k \
    123124        nic/e1k \
    124         nic/rtl8139
     125        nic/rtl8139 \
     126        block/ahci
    125127
    126128RD_DRV_CFG =
Note: See TracChangeset for help on using the changeset viewer.