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/include/il_interface.h

    r1882525 rf14291b  
    3939#define __NET_IL_INTERFACE_H__
    4040
    41 #include <async.h>
     41#include <generic.h>
    4242
    4343#include <ipc/services.h>
     44#include <ipc/il.h>
    4445
    45 #include <net_messages.h>
    46 #include <net_device.h>
    47 #include <packet/packet.h>
    48 #include <packet/packet_client.h>
    49 #include <il_messages.h>
     46#include <net/device.h>
     47#include <net/packet.h>
     48
     49#include <packet_client.h>
    5050
    5151/** @name Internetwork layer module interface
Note: See TracChangeset for help on using the changeset viewer.