Changeset b278b4e in mainline for uspace/srv/net/nil/eth/eth.c

Timestamp:

2010-10-10T19:52:27Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

10056483

Parents:

ae972834 (diff), eb51e31 (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 from lp:~jakub/helenos/net.

This is mostly removal of the bundle build support for the networking stack as
we don't want to manually maintain both bundled and modular configurations.

File:

• uspace/srv/net/nil/eth/eth.c (modified) (2 diffs)

uspace/srv/net/nil/eth/eth.c

@@ -788 +788 @@
 }
 
-#ifndef CONFIG_NETIF_NIL_BUNDLE
-
 /** Default thread for new connections.
  *
@@ -839 +837 @@
 }
 
-#endif /* CONFIG_NETIF_NIL_BUNDLE */
-
 /** @}
  */