Changeset ad7a6c9 in mainline for uspace/srv/hw/netif/ne2000/Makefile

Timestamp:

2011-03-30T13:10:24Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4ae90f9

Parents:

6e50466 (diff), d6b81941 (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:

• uspace/srv/hw/netif/ne2000/Makefile (moved) (moved from uspace/srv/hw/netif/dp8390/Makefile ) (1 diff)

uspace/srv/hw/netif/ne2000/Makefile

@@ -39 +39 @@
 -include $(CONFIG_MAKEFILE)
 
-ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y)
-        LIBS += $(USPACE_PREFIX)/srv/net/nil/eth/libeth.a
-endif
-
-BINARY = dp8390
+BINARY = ne2000
 
 SOURCES = \
         dp8390.c \
-        dp8390_module.c \
         ne2000.c