Changeset 7943c43 in mainline for boot/Makefile.common

Timestamp:

2012-01-16T22:45:38Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32817cc, 3fe58d3c

Parents:

9117ef9b (diff), 3ea725e (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:

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

boot/Makefile.common

@@ -105 +105 @@
         $(USPACE_PATH)/srv/fs/exfat/exfat \
         $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
+        $(USPACE_PATH)/srv/hid/remcons/remcons \
         $(USPACE_PATH)/srv/taskmon/taskmon \
         $(USPACE_PATH)/srv/net/nil/eth/eth \
@@ -124 +125 @@
         nic/lo \
         nic/ne2k \
-        nic/e1k
+        nic/e1k \
+        nic/rtl8139
 
 RD_DRV_CFG =