Changeset 4687a26c in mainline for uspace/srv/net/netstart/netstart.c

Timestamp:

2010-11-02T18:29:01Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4f35b9ff

Parents:

76e1121f (diff), 28f4adb (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/net/netstart/netstart.c (modified) (1 diff)

uspace/srv/net/netstart/netstart.c

@@ -45 +45 @@
 #include <task.h>
 #include <str_error.h>
+#include <err.h>
 #include <ipc/ipc.h>
 #include <ipc/services.h>
+#include <ipc/net_net.h>
 
-#include <net_err.h>
-#include <net_modules.h>
-#include <net_net_messages.h>
+#include <net/modules.h>
 
 #include "self_test.h"