Changeset 9fe4db3 in mainline for boot/Makefile.common

Timestamp:

2011-12-17T08:38:38Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

65d7b0a

Parents:

f4d5f90 (diff), 792807f (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

@@ -127 +127 @@
         test/test3 \
         nic/lo \
-        nic/ne2k
+        nic/ne2k \
+        nic/e1k
 
 RD_DRV_CFG =
@@ -208 +209 @@
         $(USPACE_PATH)/srv/net/cfg/general \
         $(USPACE_PATH)/srv/net/cfg/lo.nic \
-        $(USPACE_PATH)/srv/net/cfg/ne2k.nic
+        $(USPACE_PATH)/srv/net/cfg/ne2k.nic \
+        $(USPACE_PATH)/srv/net/cfg/e1k.nic
 endif