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


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/net/netstart/netstart.c

    r76e1121f r4687a26c  
    4545#include <task.h>
    4646#include <str_error.h>
     47#include <err.h>
    4748#include <ipc/ipc.h>
    4849#include <ipc/services.h>
     50#include <ipc/net_net.h>
    4951
    50 #include <net_err.h>
    51 #include <net_modules.h>
    52 #include <net_net_messages.h>
     52#include <net/modules.h>
    5353
    5454#include "self_test.h"
Note: See TracChangeset for help on using the changeset viewer.