Changeset f14291b in mainline for uspace/lib/net/nil/nil_remote.c


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/lib/net/nil/nil_remote.c

    r1882525 rf14291b  
    3636 */
    3737
    38 #include <net_messages.h>
    39 #include <net_device.h>
     38#include <nil_remote.h>
    4039#include <nil_interface.h>
    41 #include <packet/packet.h>
    42 #include <packet/packet_client.h>
    43 #include <nil_messages.h>
    44 #include <nil_remote.h>
     40#include <generic.h>
     41#include <net/device.h>
     42#include <net/packet.h>
     43#include <packet_client.h>
     44
     45#include <ipc/nil.h>
    4546
    4647/** Notify the network interface layer about the device state change.
Note: See TracChangeset for help on using the changeset viewer.