Changeset b828907 in mainline for boot/Makefile.common

Timestamp:

2012-07-20T20:29:54Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

34bc2fe

Parents:

4cdac68 (diff), 6de2d766 (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 with mainline

File:

• boot/Makefile.common (modified) (2 diffs)

boot/Makefile.common

@@ -101 +101 @@
         $(USPACE_PATH)/srv/bd/part/guid_part/g_part \
         $(USPACE_PATH)/srv/bd/part/mbr_part/mbr_part \
+        $(USPACE_PATH)/srv/bd/sata_bd/sata_bd \
         $(USPACE_PATH)/srv/clipboard/clipboard \
         $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \
@@ -126 +127 @@
         nic/ne2k \
         nic/e1k \
-        nic/rtl8139
+        nic/rtl8139 \
+        block/ahci
 
 RD_DRV_CFG =