Changeset f14291b in mainline for uspace/srv/net/net/net.h


Ignore:
Timestamp:
2010-10-19T20:55:53Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a93d79a
Parents:
1882525 (diff), a7a85d16 (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/net/net.h

    r1882525 rf14291b  
    4141#include <ipc/ipc.h>
    4242
    43 #include <net_device.h>
     43#include <net/device.h>
    4444#include <adt/char_map.h>
    4545#include <adt/generic_char_map.h>
    4646#include <adt/measured_strings.h>
    4747#include <adt/module_map.h>
    48 #include <packet/packet.h>
     48#include <net/packet.h>
    4949
    5050/** @name Modules definitions
Note: See TracChangeset for help on using the changeset viewer.