Changeset ef689ef0 in mainline for uspace/srv/net/net/net.c


Ignore:
Timestamp:
2010-10-14T22:08:50Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a7a85d16
Parents:
10056483 (diff), f63a591d (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.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/net/net/net.c

    r10056483 ref689ef0  
    4646
    4747#include <ipc/ipc.h>
     48#include <ipc/net.h>
    4849#include <ipc/services.h>
    4950
    50 #include <net_messages.h>
    5151#include <net/modules.h>
    5252#include <adt/char_map.h>
    … …  
    5757#include <il_messages.h>
    5858#include <netif_remote.h>
    59 #include <net_device.h>
     59#include <net/device.h>
    6060#include <nil_interface.h>
    6161#include <net_interface.h>
Note: See TracChangeset for help on using the changeset viewer.